dsh-nextsteps 1.4.2 → 1.4.4

package/client.js

@@ -226,11 +226,9 @@ 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 [callId, entry] of entries.entries()) {
         if (entry.turn !== turn) continue;
-        if (external && !callId.startsWith('generated-')) continue;
         best = entry;
       }
       return best;
@@ -492,7 +490,7 @@ window.__ModuleLoader__.load({
         }, []);
         const generatedRef = React.useRef(null);
         React.useEffect(() => {
-          if (pluginSettings.model === '' || sessionId === '' || turn === undefined || afterSeq === undefined) return undefined;
+          if (sessionId === '' || turn === undefined || afterSeq === undefined) return undefined;
           const key = sessionId + '|' + turn;
           if (generatedRef.current === key) return undefined;
           if (captureForTurn(sessionId, turn) !== null) return undefined;
@@ -565,17 +563,31 @@ window.__ModuleLoader__.load({
         const install = async () => {
           const { info } = update;
           let pluginManager;
-          try { pluginManager = ctx.get('remote')?.pluginManager; } catch { pluginManager = undefined; }
-          if (info === undefined || pluginManager === undefined || typeof pluginManager.installBundle !== 'function') return;
+          try {
+            pluginManager = ctx.remote?.pluginManager ?? ctx.get?.('remote')?.pluginManager;
+          } catch { pluginManager = undefined; }
+          if (info === undefined) return;
+          if (pluginManager === undefined || typeof pluginManager.installBundle !== 'function') {
+            setUpdate({ status: 'error', info, error: 'the plugin manager is not available in this install' });
+            return;
+          }
           setUpdate({ status: 'installing', info });
           try {
+            const requestId = NS + '-update-' + info.latest + '-' + Date.now();
             const attempt = async (spec) => {
-              const reply = await pluginManager.installBundle(spec, { requestId: NS + '-update-' + info.latest + '-' + Date.now() });
+              const reply = await pluginManager.installBundle(spec, { enabled: true, requestId });
               if (reply === null || typeof reply !== 'object' || reply.ok !== true) throw new Error(reply?.error?.message ?? 'plugin manager did not answer');
               return reply.value;
             };
-            let result = await attempt(NPM_NAME + '@' + info.latest);
-            if (result !== null && typeof result === 'object' && result.error?.code === 'already-installed') result = await attempt('https://registry.npmjs.org/' + NPM_NAME + '/-/' + NPM_NAME + '-' + info.latest + '.tgz');
+            let result;
+            if (typeof pluginManager.updateBundle === 'function') {
+              const reply = await pluginManager.updateBundle(NPM_NAME, info.latest, { requestId });
+              if (reply === null || typeof reply !== 'object' || reply.ok !== true) throw new Error(reply?.error?.message ?? 'plugin manager did not answer');
+              result = reply.value;
+            } else {
+              result = await attempt(NPM_NAME + '@' + info.latest);
+              if (result !== null && typeof result === 'object' && result.error?.code === 'already-installed') result = await attempt('https://registry.npmjs.org/' + NPM_NAME + '/-/' + NPM_NAME + '-' + info.latest + '.tgz');
+            }
             const applied = result !== null && typeof result === 'object' && (result.application === 'applied' || result.application === 'restart-required' || result.version === info.latest);
             if (!applied) {
               const diagnostic = typeof result?.error?.diagnostic === 'string' ? result.error.diagnostic.split('\n').find((entry) => entry.trim() !== '') : undefined;

package/index.js

@@ -124,7 +124,16 @@ const PARAMETER_SCHEMA = {
   required: ['followups']
 };
 
-function toolDescription(external = false) {
+function languageRuleOf(settings) {
+  const language = LANGUAGE_NAMES[settings.lang] ?? LANGUAGE_NAMES.auto;
+  if (settings.lang === 'auto') {
+    return 'Write every prompt and label in the same language the conversation has been using.';
+  }
+  return `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.`;
+}
+
+function toolDescription(settings = { lang: 'auto', maxFollowups: 3, model: '' }) {
+  const external = typeof settings.model === 'string' && settings.model !== '';
   if (external) {
     return [
       'This tool is not used any more: the host generates the followup suggestions after your turn with a separate model.',
@@ -133,10 +142,10 @@ function toolDescription(external = false) {
   }
   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; when there is no such section, suggest three.',
+    `Suggest exactly ${settings.maxFollowups} followup prompts when you call suggest_followups.`,
     '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; when there is no such section, use the language of the conversation.',
+    languageRuleOf(settings),
     '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:',
@@ -144,21 +153,22 @@ function toolDescription(external = false) {
   ].join('\n');
 }
 
+const CURRENT_STATEMENT = 'This is the current setting for this turn; if an earlier message in this conversation stated a different one, ignore that earlier statement.';
+
 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.'
+      'nextsteps (the followup suggestion cards):',
+      `- ${CURRENT_STATEMENT}`,
+      '- 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):',
+    `- ${CURRENT_STATEMENT}`,
     `- Suggest exactly ${settings.maxFollowups} followup prompts when you call suggest_followups.`,
-    `- ${languageRule}`
+    `- ${languageRuleOf(settings)}`
   ].join('\n');
 }
 
@@ -168,7 +178,7 @@ function toolSpec(settings = { lang: 'auto', maxFollowups: 3, model: '' }) {
   const external = typeof settings.model === 'string' && settings.model !== '';
   return {
     name: TOOL_NAME,
-    description: toolDescription(external),
+    description: toolDescription(settings),
     parameters: PARAMETER_SCHEMA,
     output: {
       schema: { type: 'string' },
@@ -283,8 +293,15 @@ async function generateForTurn(ctx, settings, sessionId, afterSeq, signal) {
   let transcript;
   try {
     const events = observation.events ?? [];
-    const last = events.at(-1)?.event ?? events.at(-1);
-    if (last?.type !== 'turn/end' || last.data?.reason?.kind !== 'completed' || last.seq !== afterSeq) {
+    const turnEnd = events.find((entry) => {
+      const event = entry?.event ?? entry;
+      return event?.type === 'turn/end' && event.seq === afterSeq;
+    });
+    const newerTurn = events.some((entry) => {
+      const event = entry?.event ?? entry;
+      return event?.type === 'turn/end' && Number.isSafeInteger(event.seq) && event.seq > afterSeq;
+    });
+    if (turnEnd === undefined || newerTurn || turnEnd.data?.reason?.kind !== 'completed') {
       throw Object.assign(new Error('the chat moved on'), { status: 409 });
     }
     transcript = turnTranscript(events, afterSeq);
@@ -292,6 +309,7 @@ async function generateForTurn(ctx, settings, sessionId, afterSeq, signal) {
     observation[Symbol.dispose]?.();
   }
   if (transcript.trim() === '') return { followups: [] };
+  if (typeof settings.model !== 'string' || settings.model === '') return { followups: [] };
   const catalog = await modelCatalog(ctx);
   const route = settings.model !== ''
     ? (() => {

package/package.json

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

package/scripts/suite/host.test.mjs

@@ -79,7 +79,7 @@ test("the description survives a host without a system prompt service", async ()
   const mod = await import(moduleUrl.href);
   await mod.apply(ctx);
   const description = registered[0].description;
-  assertIncludes(description, "when there is no such section, use the language of the conversation", "the description must fall back to the conversation language");
+  assertMatch(description, /write every prompt and label in/i, "the description must carry the language rule without the system prompt section");
 });
 
 test("the bundle does not require optional host services to load", async () => {