prior-cli 1.6.3 → 1.6.5

package/bin/prior.js

@@ -45,6 +45,48 @@ let _spinIdx   = 0;
 let _spinStart = null;
 let _spinLabel = '';
 
+// ── Tool keyword hints ─────────────────────────────────────────
+// Detects keywords in user input and prepends a hard directive so
+// the model can't second-guess which tool to use.
+const TOOL_HINTS = [
+  {
+    tool: 'ssl_check',
+    patterns: [
+      /\bssl\b/i, /\btls\b/i, /\bcertificate\b/i, /\bcert\b/i,
+      /\bhttps check\b/i, /\bcert expir/i, /\bssl expir/i,
+    ],
+    hint: '[TOOL DIRECTIVE: You MUST call ssl_check — do NOT use zap_scan or zap_alerts]',
+  },
+  {
+    tool: 'dns_lookup',
+    patterns: [
+      /\bdns\b/i, /\bmx record/i, /\bnameserver/i, /\bnslookup\b/i,
+      /\bdig\b/i, /\bdns record/i, /\btxt record/i, /\bcname\b/i,
+      /\bns record/i, /\baaaa record/i,
+    ],
+    hint: '[TOOL DIRECTIVE: You MUST call dns_lookup]',
+  },
+  {
+    tool: 'ip_lookup',
+    patterns: [
+      /\bip lookup\b/i, /\blook up.*ip\b/i, /\bwhere is .+ hosted\b/i,
+      /\bwho owns .+(ip|domain)\b/i, /\basn\b/i, /\bgeolocation\b/i,
+      /\bwhat ip\b/i, /\bresolve .+(domain|host)\b/i,
+      /\blookup\b.*\b(ip|domain|host)\b/i,
+    ],
+    hint: '[TOOL DIRECTIVE: You MUST call ip_lookup]',
+  },
+];
+
+function injectToolHint(text) {
+  for (const { patterns, hint } of TOOL_HINTS) {
+    if (patterns.some(re => re.test(text))) {
+      return `${hint}\n${text}`;
+    }
+  }
+  return text;
+}
+
 function fmtElapsed(ms) {
   const s = Math.floor(ms / 1000);
   if (s < 60) return `${s}s`;
@@ -1285,7 +1327,7 @@ Be concise but thorough — this summary replaces the full history to save conte
 
           _currentAbortController = new AbortController();
           await runAgent({
-            messages:       [...chatHistory, { role: 'user', content: input }],
+            messages:       [...chatHistory, { role: 'user', content: injectToolHint(input) }],
             model:          currentModel,
             cwd:            process.cwd(),
             projectContext,

package/lib/agent.js

@@ -77,6 +77,21 @@ function parseToolCalls(text) {
     } catch { /* skip */ }
   }
 
+  // Fallback: unclosed <tool>{...}  (no closing </tool> — some models omit it)
+  const reUnclosed = /<tool>(\{[\s\S]*?\})\s*(?=$|\n|<)/g;
+  while ((m = reUnclosed.exec(text)) !== null) {
+    const alreadyCaptured = calls.some(c => m.index >= c.offset && m.index < c.offset + c.raw.length);
+    if (alreadyCaptured) continue;
+    try {
+      const fixed  = fixJsonLiterals(m[1].trim());
+      const parsed = JSON.parse(fixed);
+      if (parsed && typeof parsed.name === 'string') {
+        const { name, args, ...rest } = parsed;
+        calls.push({ raw: m[0], offset: m.index, name, args: args || (Object.keys(rest).length > 0 ? rest : {}) });
+      }
+    } catch { /* skip */ }
+  }
+
   // Primary variant: <tool name="X">{"args"}</tool>  (name as attribute — used by some models)
   const reAttr = /<tool\s+name="([^"]+)"[^>]*>([\s\S]*?)<\/tool>/g;
   while ((m = reAttr.exec(text)) !== null) {
@@ -188,6 +203,10 @@ function truncateAtFakeTurn(text) {
 function stripToolTags(text) {
   // <tool>...</tool>
   let out = text.replace(/<tool>[\s\S]*?<\/tool>/gi, '');
+  // Unclosed <tool>{...}  (no closing tag)
+  out = out.replace(/<tool>\{[\s\S]*?\}\s*/gi, '');
+  // Bare <tool> with no content following
+  out = out.replace(/<\/?tool>/gi, '');
   const namesPattern = TOOL_NAMES.join('|');
   // <tool_name ...>...</tool_name>  (with or without attributes/JSON)
   out = out.replace(new RegExp(`<(?:${namesPattern})[^>]*>[\\s\\S]*?<\\/(?:${namesPattern})>`, 'gi'), '');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prior-cli",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "description": "Prior Network AI — command-line interface",
   "bin": {
     "prior": "bin/prior.js"