fix(output): preserve hook budgets and search paths

Author: KRATOS

internal/tools/output_boundary.go

@@ -85,6 +85,12 @@ func selfManagedOutputBudget(toolName string, args map[string]any) outputBudget
 func (registry *Registry) RebudgetAfterHook(toolName string, args map[string]any, result Result) Result {
 	result = scrubResultSecrets(result)
 	tool, _ := registry.Get(toolName)
+	if _, ok := tool.(selfBudgeting); ok {
+		// Match the primary registry boundary: self-managed tools keep their
+		// call-specific capture/output budget instead of being tightened or
+		// loosened to the generic registry ceiling after hook feedback.
+		return applySelfManagedOutputBudget(tool, toolName, args, result)
+	}
 	result = applyRegistryOutputBudget(tool, toolName, args, result)
 	return enforceOutputCeiling(toolName, result)
 }

internal/tools/output_boundary_test.go

@@ -307,3 +307,26 @@ func TestRegistryAppliesSemanticBudgetToSelfManagedProcessOutput(t *testing.T) {
 		}
 	}
 }
+
+func TestRebudgetAfterHookPreservesSelfManagedExecBudget(t *testing.T) {
+	setTestTempDir(t)
+	registry := NewRegistry()
+	registry.Register(NewExecCommandTool(t.TempDir(), newExecSessionManager()))
+
+	t.Run("tight call budget remains authoritative", func(t *testing.T) {
+		args := map[string]any{"cmd": "make build", "max_output_tokens": 10}
+		result := registry.RebudgetAfterHook(ExecCommandToolName, args, Result{Status: StatusOK, Output: strings.Repeat("x", 1_000)})
+		if !result.Truncated || len(result.Output) > 40 {
+			t.Fatalf("post-hook output escaped call budget: truncated=%t bytes=%d meta=%#v", result.Truncated, len(result.Output), result.Meta)
+		}
+	})
+
+	t.Run("raised call budget is not replaced by generic ceiling", func(t *testing.T) {
+		args := map[string]any{"cmd": "make build", "max_output_tokens": 20_000}
+		output := strings.Repeat("x", 70_000)
+		result := registry.RebudgetAfterHook(ExecCommandToolName, args, Result{Status: StatusOK, Output: output})
+		if result.Truncated || result.Output != output {
+			t.Fatalf("post-hook output was incorrectly limited by generic ceiling: truncated=%t bytes=%d", result.Truncated, len(result.Output))
+		}
+	})
+}

internal/tools/output_policies.go

@@ -398,21 +398,28 @@ func collapseConsecutiveDuplicateLines(lines []string) []string {
 }
 
 func searchResultFile(line string) string {
-	// Search output is path:line: text. Locate the numeric line field from
-	// the right so a Windows drive prefix (C:) remains part of the path.
-	for end := len(line); end > 0; {
-		lineEnd := strings.LastIndex(line[:end], ":")
-		if lineEnd < 0 {
+	// Search output is path:line: text. Locate the first numeric field from
+	// the left after an optional Windows drive prefix. Match text may itself
+	// contain numeric colon-delimited fields, which are not record structure.
+	searchFrom := 0
+	if len(line) >= 2 && line[1] == ':' && ((line[0] >= 'A' && line[0] <= 'Z') || (line[0] >= 'a' && line[0] <= 'z')) {
+		searchFrom = 2
+	}
+	for searchFrom < len(line) {
+		lineStartOffset := strings.IndexByte(line[searchFrom:], ':')
+		if lineStartOffset < 0 {
 			return ""
 		}
-		lineStart := strings.LastIndex(line[:lineEnd], ":")
-		if lineStart < 0 {
+		lineStart := searchFrom + lineStartOffset
+		lineEndOffset := strings.IndexByte(line[lineStart+1:], ':')
+		if lineEndOffset < 0 {
 			return ""
 		}
+		lineEnd := lineStart + 1 + lineEndOffset
 		if _, err := strconv.Atoi(line[lineStart+1 : lineEnd]); err == nil {
 			return strings.TrimSpace(line[:lineStart])
 		}
-		end = lineStart
+		searchFrom = lineStart + 1
 	}
 	return ""
 }

internal/tools/output_policies_test.go

@@ -58,6 +58,22 @@ func TestSearchOutputPolicyPreservesWindowsPathCoverage(t *testing.T) {
 	}
 }
 
+func TestSearchResultFileIgnoresNumericMatchContent(t *testing.T) {
+	tests := []struct {
+		line string
+		want string
+	}{
+		{line: `C:\workspace\a.go:12: error code:123: failed`, want: `C:\workspace\a.go`},
+		{line: `/workspace/a.go:12: error code:123: failed`, want: `/workspace/a.go`},
+		{line: `/workspace/name:with-colon.go:12: match`, want: `/workspace/name:with-colon.go`},
+	}
+	for _, test := range tests {
+		if got := searchResultFile(test.line); got != test.want {
+			t.Errorf("searchResultFile(%q) = %q, want %q", test.line, got, test.want)
+		}
+	}
+}
+
 func TestProcessOutputPolicyCollapsesRepetitiveLogsAndKeepsDiagnostics(t *testing.T) {
 	input := "starting server\n" + strings.Repeat("polling...\n", 300) + "WARNING: queue slow\nERROR: request failed\nshutdown complete"
 	got := budgetSemanticOutput(input, outputCategoryProcess, semanticTestBudget())