@probelabs/probe 0.6.0-rc204 → 0.6.0-rc205

package/build/agent/ProbeAgent.js

@@ -3146,10 +3146,13 @@ Remember: Use proper XML format with BOTH opening and closing tags:
 
 Available tools: ${validTools.join(', ')}
 
-Or for quick completion if your previous response was already correct and complete:
-<attempt_complete>
+To complete with a direct answer:
+<attempt_completion>Your final answer here</attempt_completion>
+
+Or if your previous response already contains a complete, direct answer (not a thinking block or JSON):
+<attempt_complete></attempt_complete>
 
-IMPORTANT: When using <attempt_complete>, this must be the ONLY content in your response. No additional text, explanations, or other content should be included. This tag signals to reuse your previous response as the final answer.`;
+Note: <attempt_complete></attempt_complete> reuses your PREVIOUS assistant message as the final answer. Only use this if that message was already a valid, complete response to the user's question.`;
           }
 
           currentMessages.push({
@@ -4062,9 +4065,9 @@ Convert your previous response content into actual JSON data that follows this s
       return true;
     }
 
-    // Empty attempt_complete reminders
-    if (content.includes('When using <attempt_complete>') &&
-        content.includes('this must be the ONLY content in your response')) {
+    // Empty attempt_complete reminders (legacy and new format)
+    if (content.includes('<attempt_complete></attempt_complete>') &&
+        content.includes('reuses your PREVIOUS assistant message')) {
       return true;
     }
 

package/build/agent/index.js

@@ -31713,6 +31713,8 @@ var init_semantics = __esm({
       constructor(ctx, knownIds, knownEdgeIds) {
         super();
         this.edgeCount = 0;
+        this.subgraphStack = [];
+        this.reportedSubgraphIdCollision = /* @__PURE__ */ new Set();
         this.validateVisitor();
         this.ctx = ctx;
         this.knownIds = knownIds;
@@ -31905,8 +31907,13 @@ var init_semantics = __esm({
         }
       }
       subgraph(ctx) {
+        const idTok = ctx.subgraphIdOrFirstWord && ctx.subgraphIdOrFirstWord[0];
+        if (idTok)
+          this.subgraphStack.push({ id: String(idTok.image) });
         if (ctx.subgraphStatement)
           ctx.subgraphStatement.forEach((s) => this.visit(s));
+        if (idTok)
+          this.subgraphStack.pop();
       }
       subgraphStatement(ctx) {
         for (const k of Object.keys(ctx)) {
@@ -31969,6 +31976,27 @@ var init_semantics = __esm({
         }
         if (ctx.nodeShape)
           ctx.nodeShape.forEach((n) => this.visit(n));
+        const idTok = ctx.nodeId && ctx.nodeId[0];
+        const idNumTok = ctx.nodeIdNum && ctx.nodeIdNum[0];
+        const idToken = idTok || idNumTok;
+        if (idToken && this.subgraphStack.length > 0) {
+          const id = String(idToken.image);
+          const hasCollision = this.subgraphStack.some((sg) => sg.id === id);
+          if (hasCollision) {
+            const key = `${id}:${idToken.startLine ?? 1}:${idToken.startColumn ?? 1}`;
+            if (!this.reportedSubgraphIdCollision.has(key)) {
+              this.reportedSubgraphIdCollision.add(key);
+              this.ctx.errors.push({
+                line: idToken.startLine ?? 1,
+                column: idToken.startColumn ?? 1,
+                severity: "error",
+                code: "FL-SUBGRAPH-ID-COLLISION",
+                message: `Node id '${id}' conflicts with an enclosing subgraph id and creates a cycle in Mermaid.`,
+                hint: "Rename the subgraph id or the node id, or use a quoted subgraph title with no explicit id."
+              });
+            }
+          }
+        }
         if (hasAttr) {
           const attr = ctx.attrObject?.[0];
           const pairs = attr?.children?.attrPair || [];
@@ -36009,6 +36037,7 @@ function computeFixes(text, errors, level = "safe") {
   const patchedLines = /* @__PURE__ */ new Set();
   const seen = /* @__PURE__ */ new Set();
   const piQuoteClosedLines = /* @__PURE__ */ new Set();
+  const subgraphCollisionRename = /* @__PURE__ */ new Map();
   function sanitizeAllQuotedSegmentsInShapes(lineText, lineNo) {
     const shapes = [
       { open: "[[", close: "]]" },
@@ -36728,6 +36757,28 @@ function computeFixes(text, errors, level = "safe") {
       }
       continue;
     }
+    if (is("FL-SUBGRAPH-ID-COLLISION", e)) {
+      if (level === "all") {
+        const lineText = lineTextAt(text, e.line);
+        if (lineText.trimStart().startsWith("subgraph"))
+          continue;
+        const caret0 = Math.max(0, e.column - 1);
+        const slice = lineText.slice(caret0);
+        const m = slice.match(/^([A-Za-z_][A-Za-z0-9_]*(?:-[A-Za-z0-9_]+)*)/);
+        if (m) {
+          const id = m[1];
+          let newId = subgraphCollisionRename.get(id);
+          if (!newId) {
+            newId = id.endsWith("_node") ? `${id}2` : `${id}_node`;
+            subgraphCollisionRename.set(id, newId);
+          }
+          if (newId !== id) {
+            edits.push(replaceRange(text, { line: e.line, column: caret0 + 1 }, id.length, newId));
+          }
+        }
+      }
+      continue;
+    }
     if (is("FL-LABEL-QUOTE-IN-UNQUOTED", e)) {
       if (level === "safe" || level === "all") {
         const lineText = lineTextAt(text, e.line);
@@ -71005,10 +71056,13 @@ Remember: Use proper XML format with BOTH opening and closing tags:
 
 Available tools: ${validTools.join(", ")}
 
-Or for quick completion if your previous response was already correct and complete:
-<attempt_complete>
+To complete with a direct answer:
+<attempt_completion>Your final answer here</attempt_completion>
+
+Or if your previous response already contains a complete, direct answer (not a thinking block or JSON):
+<attempt_complete></attempt_complete>
 
-IMPORTANT: When using <attempt_complete>, this must be the ONLY content in your response. No additional text, explanations, or other content should be included. This tag signals to reuse your previous response as the final answer.`;
+Note: <attempt_complete></attempt_complete> reuses your PREVIOUS assistant message as the final answer. Only use this if that message was already a valid, complete response to the user's question.`;
               }
               currentMessages.push({
                 role: "user",
@@ -71711,7 +71765,7 @@ Convert your previous response content into actual JSON data that follows this s
         if (content.includes("Your response does not match the expected JSON schema") || content.includes("Please provide a valid JSON response") || content.includes("Schema validation error:")) {
           return true;
         }
-        if (content.includes("When using <attempt_complete>") && content.includes("this must be the ONLY content in your response")) {
+        if (content.includes("<attempt_complete></attempt_complete>") && content.includes("reuses your PREVIOUS assistant message")) {
           return true;
         }
         return false;

package/cjs/agent/ProbeAgent.cjs

@@ -59506,6 +59506,8 @@ var init_semantics = __esm({
       constructor(ctx, knownIds, knownEdgeIds) {
         super();
         this.edgeCount = 0;
+        this.subgraphStack = [];
+        this.reportedSubgraphIdCollision = /* @__PURE__ */ new Set();
         this.validateVisitor();
         this.ctx = ctx;
         this.knownIds = knownIds;
@@ -59698,8 +59700,13 @@ var init_semantics = __esm({
         }
       }
       subgraph(ctx) {
+        const idTok = ctx.subgraphIdOrFirstWord && ctx.subgraphIdOrFirstWord[0];
+        if (idTok)
+          this.subgraphStack.push({ id: String(idTok.image) });
         if (ctx.subgraphStatement)
           ctx.subgraphStatement.forEach((s5) => this.visit(s5));
+        if (idTok)
+          this.subgraphStack.pop();
       }
       subgraphStatement(ctx) {
         for (const k5 of Object.keys(ctx)) {
@@ -59762,6 +59769,27 @@ var init_semantics = __esm({
         }
         if (ctx.nodeShape)
           ctx.nodeShape.forEach((n5) => this.visit(n5));
+        const idTok = ctx.nodeId && ctx.nodeId[0];
+        const idNumTok = ctx.nodeIdNum && ctx.nodeIdNum[0];
+        const idToken = idTok || idNumTok;
+        if (idToken && this.subgraphStack.length > 0) {
+          const id = String(idToken.image);
+          const hasCollision = this.subgraphStack.some((sg) => sg.id === id);
+          if (hasCollision) {
+            const key = `${id}:${idToken.startLine ?? 1}:${idToken.startColumn ?? 1}`;
+            if (!this.reportedSubgraphIdCollision.has(key)) {
+              this.reportedSubgraphIdCollision.add(key);
+              this.ctx.errors.push({
+                line: idToken.startLine ?? 1,
+                column: idToken.startColumn ?? 1,
+                severity: "error",
+                code: "FL-SUBGRAPH-ID-COLLISION",
+                message: `Node id '${id}' conflicts with an enclosing subgraph id and creates a cycle in Mermaid.`,
+                hint: "Rename the subgraph id or the node id, or use a quoted subgraph title with no explicit id."
+              });
+            }
+          }
+        }
         if (hasAttr) {
           const attr = ctx.attrObject?.[0];
           const pairs = attr?.children?.attrPair || [];
@@ -63802,6 +63830,7 @@ function computeFixes(text, errors, level = "safe") {
   const patchedLines = /* @__PURE__ */ new Set();
   const seen = /* @__PURE__ */ new Set();
   const piQuoteClosedLines = /* @__PURE__ */ new Set();
+  const subgraphCollisionRename = /* @__PURE__ */ new Map();
   function sanitizeAllQuotedSegmentsInShapes(lineText, lineNo) {
     const shapes = [
       { open: "[[", close: "]]" },
@@ -64521,6 +64550,28 @@ function computeFixes(text, errors, level = "safe") {
       }
       continue;
     }
+    if (is("FL-SUBGRAPH-ID-COLLISION", e5)) {
+      if (level === "all") {
+        const lineText = lineTextAt(text, e5.line);
+        if (lineText.trimStart().startsWith("subgraph"))
+          continue;
+        const caret0 = Math.max(0, e5.column - 1);
+        const slice = lineText.slice(caret0);
+        const m5 = slice.match(/^([A-Za-z_][A-Za-z0-9_]*(?:-[A-Za-z0-9_]+)*)/);
+        if (m5) {
+          const id = m5[1];
+          let newId = subgraphCollisionRename.get(id);
+          if (!newId) {
+            newId = id.endsWith("_node") ? `${id}2` : `${id}_node`;
+            subgraphCollisionRename.set(id, newId);
+          }
+          if (newId !== id) {
+            edits.push(replaceRange(text, { line: e5.line, column: caret0 + 1 }, id.length, newId));
+          }
+        }
+      }
+      continue;
+    }
     if (is("FL-LABEL-QUOTE-IN-UNQUOTED", e5)) {
       if (level === "safe" || level === "all") {
         const lineText = lineTextAt(text, e5.line);
@@ -98797,10 +98848,13 @@ Remember: Use proper XML format with BOTH opening and closing tags:
 
 Available tools: ${validTools.join(", ")}
 
-Or for quick completion if your previous response was already correct and complete:
-<attempt_complete>
+To complete with a direct answer:
+<attempt_completion>Your final answer here</attempt_completion>
+
+Or if your previous response already contains a complete, direct answer (not a thinking block or JSON):
+<attempt_complete></attempt_complete>
 
-IMPORTANT: When using <attempt_complete>, this must be the ONLY content in your response. No additional text, explanations, or other content should be included. This tag signals to reuse your previous response as the final answer.`;
+Note: <attempt_complete></attempt_complete> reuses your PREVIOUS assistant message as the final answer. Only use this if that message was already a valid, complete response to the user's question.`;
               }
               currentMessages.push({
                 role: "user",
@@ -99503,7 +99557,7 @@ Convert your previous response content into actual JSON data that follows this s
         if (content.includes("Your response does not match the expected JSON schema") || content.includes("Please provide a valid JSON response") || content.includes("Schema validation error:")) {
           return true;
         }
-        if (content.includes("When using <attempt_complete>") && content.includes("this must be the ONLY content in your response")) {
+        if (content.includes("<attempt_complete></attempt_complete>") && content.includes("reuses your PREVIOUS assistant message")) {
           return true;
         }
         return false;

package/cjs/index.cjs

@@ -57189,6 +57189,8 @@ var init_semantics = __esm({
       constructor(ctx, knownIds, knownEdgeIds) {
         super();
         this.edgeCount = 0;
+        this.subgraphStack = [];
+        this.reportedSubgraphIdCollision = /* @__PURE__ */ new Set();
         this.validateVisitor();
         this.ctx = ctx;
         this.knownIds = knownIds;
@@ -57381,8 +57383,13 @@ var init_semantics = __esm({
         }
       }
       subgraph(ctx) {
+        const idTok = ctx.subgraphIdOrFirstWord && ctx.subgraphIdOrFirstWord[0];
+        if (idTok)
+          this.subgraphStack.push({ id: String(idTok.image) });
         if (ctx.subgraphStatement)
           ctx.subgraphStatement.forEach((s5) => this.visit(s5));
+        if (idTok)
+          this.subgraphStack.pop();
       }
       subgraphStatement(ctx) {
         for (const k5 of Object.keys(ctx)) {
@@ -57445,6 +57452,27 @@ var init_semantics = __esm({
         }
         if (ctx.nodeShape)
           ctx.nodeShape.forEach((n5) => this.visit(n5));
+        const idTok = ctx.nodeId && ctx.nodeId[0];
+        const idNumTok = ctx.nodeIdNum && ctx.nodeIdNum[0];
+        const idToken = idTok || idNumTok;
+        if (idToken && this.subgraphStack.length > 0) {
+          const id = String(idToken.image);
+          const hasCollision = this.subgraphStack.some((sg) => sg.id === id);
+          if (hasCollision) {
+            const key = `${id}:${idToken.startLine ?? 1}:${idToken.startColumn ?? 1}`;
+            if (!this.reportedSubgraphIdCollision.has(key)) {
+              this.reportedSubgraphIdCollision.add(key);
+              this.ctx.errors.push({
+                line: idToken.startLine ?? 1,
+                column: idToken.startColumn ?? 1,
+                severity: "error",
+                code: "FL-SUBGRAPH-ID-COLLISION",
+                message: `Node id '${id}' conflicts with an enclosing subgraph id and creates a cycle in Mermaid.`,
+                hint: "Rename the subgraph id or the node id, or use a quoted subgraph title with no explicit id."
+              });
+            }
+          }
+        }
         if (hasAttr) {
           const attr = ctx.attrObject?.[0];
           const pairs = attr?.children?.attrPair || [];
@@ -61485,6 +61513,7 @@ function computeFixes(text, errors, level = "safe") {
   const patchedLines = /* @__PURE__ */ new Set();
   const seen = /* @__PURE__ */ new Set();
   const piQuoteClosedLines = /* @__PURE__ */ new Set();
+  const subgraphCollisionRename = /* @__PURE__ */ new Map();
   function sanitizeAllQuotedSegmentsInShapes(lineText, lineNo) {
     const shapes = [
       { open: "[[", close: "]]" },
@@ -62204,6 +62233,28 @@ function computeFixes(text, errors, level = "safe") {
       }
       continue;
     }
+    if (is("FL-SUBGRAPH-ID-COLLISION", e5)) {
+      if (level === "all") {
+        const lineText = lineTextAt(text, e5.line);
+        if (lineText.trimStart().startsWith("subgraph"))
+          continue;
+        const caret0 = Math.max(0, e5.column - 1);
+        const slice = lineText.slice(caret0);
+        const m5 = slice.match(/^([A-Za-z_][A-Za-z0-9_]*(?:-[A-Za-z0-9_]+)*)/);
+        if (m5) {
+          const id = m5[1];
+          let newId = subgraphCollisionRename.get(id);
+          if (!newId) {
+            newId = id.endsWith("_node") ? `${id}2` : `${id}_node`;
+            subgraphCollisionRename.set(id, newId);
+          }
+          if (newId !== id) {
+            edits.push(replaceRange(text, { line: e5.line, column: caret0 + 1 }, id.length, newId));
+          }
+        }
+      }
+      continue;
+    }
     if (is("FL-LABEL-QUOTE-IN-UNQUOTED", e5)) {
       if (level === "safe" || level === "all") {
         const lineText = lineTextAt(text, e5.line);
@@ -96480,10 +96531,13 @@ Remember: Use proper XML format with BOTH opening and closing tags:
 
 Available tools: ${validTools.join(", ")}
 
-Or for quick completion if your previous response was already correct and complete:
-<attempt_complete>
+To complete with a direct answer:
+<attempt_completion>Your final answer here</attempt_completion>
+
+Or if your previous response already contains a complete, direct answer (not a thinking block or JSON):
+<attempt_complete></attempt_complete>
 
-IMPORTANT: When using <attempt_complete>, this must be the ONLY content in your response. No additional text, explanations, or other content should be included. This tag signals to reuse your previous response as the final answer.`;
+Note: <attempt_complete></attempt_complete> reuses your PREVIOUS assistant message as the final answer. Only use this if that message was already a valid, complete response to the user's question.`;
               }
               currentMessages.push({
                 role: "user",
@@ -97186,7 +97240,7 @@ Convert your previous response content into actual JSON data that follows this s
         if (content.includes("Your response does not match the expected JSON schema") || content.includes("Please provide a valid JSON response") || content.includes("Schema validation error:")) {
           return true;
         }
-        if (content.includes("When using <attempt_complete>") && content.includes("this must be the ONLY content in your response")) {
+        if (content.includes("<attempt_complete></attempt_complete>") && content.includes("reuses your PREVIOUS assistant message")) {
           return true;
         }
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@probelabs/probe",
-  "version": "0.6.0-rc204",
+  "version": "0.6.0-rc205",
   "description": "Node.js wrapper for the probe code search tool",
   "main": "src/index.js",
   "module": "src/index.js",
@@ -79,7 +79,7 @@
     "@ai-sdk/openai": "^2.0.10",
     "@anthropic-ai/claude-agent-sdk": "^0.1.46",
     "@modelcontextprotocol/sdk": "^1.0.0",
-    "@probelabs/maid": "^0.0.22",
+    "@probelabs/maid": "^0.0.23",
     "adm-zip": "^0.5.16",
     "ai": "^5.0.0",
     "ajv": "^8.17.1",

package/src/agent/ProbeAgent.js

@@ -3146,10 +3146,13 @@ Remember: Use proper XML format with BOTH opening and closing tags:
 
 Available tools: ${validTools.join(', ')}
 
-Or for quick completion if your previous response was already correct and complete:
-<attempt_complete>
+To complete with a direct answer:
+<attempt_completion>Your final answer here</attempt_completion>
+
+Or if your previous response already contains a complete, direct answer (not a thinking block or JSON):
+<attempt_complete></attempt_complete>
 
-IMPORTANT: When using <attempt_complete>, this must be the ONLY content in your response. No additional text, explanations, or other content should be included. This tag signals to reuse your previous response as the final answer.`;
+Note: <attempt_complete></attempt_complete> reuses your PREVIOUS assistant message as the final answer. Only use this if that message was already a valid, complete response to the user's question.`;
           }
 
           currentMessages.push({
@@ -4062,9 +4065,9 @@ Convert your previous response content into actual JSON data that follows this s
       return true;
     }
 
-    // Empty attempt_complete reminders
-    if (content.includes('When using <attempt_complete>') &&
-        content.includes('this must be the ONLY content in your response')) {
+    // Empty attempt_complete reminders (legacy and new format)
+    if (content.includes('<attempt_complete></attempt_complete>') &&
+        content.includes('reuses your PREVIOUS assistant message')) {
       return true;
     }