inserttext simplify and some tool schema mods

Author: ppipada

README.md

@@ -83,7 +83,7 @@ Grouped under `texttool`.
 
 - `readtextrange`: read lines, optionally constrained by unique start/end marker blocks.
 - `findtext`: find matches with context.
-- `inserttextlines`: insert lines at start/end/between text blocks.
+- `inserttext`: insert lines at start/end/between text blocks.
 - `replacetext`: replace exact line blocks, with optional disambiguation using adjacent lines.
 - `deletetextlines`: delete exact line blocks, with optional disambiguation using adjacent lines.
 

internal/integration/helpers_test.go

@@ -106,8 +106,8 @@ func newHarness(t *testing.T, base string, execOpts ...exectool.ExecToolOption)
 	if err := llmtools.RegisterTypedAsTextTool(r, tt.FindTextTool(), tt.FindText); err != nil {
 		t.Fatalf("register findtext: %v", err)
 	}
-	if err := llmtools.RegisterTypedAsTextTool(r, tt.InsertTextLinesTool(), tt.InsertTextLines); err != nil {
-		t.Fatalf("register inserttextlines: %v", err)
+	if err := llmtools.RegisterTypedAsTextTool(r, tt.InsertTextTool(), tt.InsertText); err != nil {
+		t.Fatalf("register inserttext: %v", err)
 	}
 	if err := llmtools.RegisterTypedAsTextTool(r, tt.ReplaceTextTool(), tt.ReplaceText); err != nil {
 		t.Fatalf("register replacetext: %v", err)

internal/integration/text_test.go

@@ -74,7 +74,7 @@ func TestE2E_Text_ReadModifyLoop(t *testing.T) {
 	})
 
 	// 5) Insert after a uniquely-matched anchor.
-	_ = callJSON[texttool.InsertTextLinesOut](t, h.r, "inserttextlines", texttool.InsertTextLinesArgs{
+	_ = callJSON[texttool.InsertTextOut](t, h.r, "inserttext", texttool.InsertTextArgs{
 		Path:      docRel,
 		Position:  "between",
 		TextAbove: stringPtr("<!-- A END -->\n\n"),

registry.go

@@ -148,7 +148,7 @@ func RegisterBuiltins(r *Registry) error {
 	if err := RegisterTypedAsTextTool(r, tt.FindTextTool(), tt.FindText); err != nil {
 		return err
 	}
-	if err := RegisterTypedAsTextTool(r, tt.InsertTextLinesTool(), tt.InsertTextLines); err != nil {
+	if err := RegisterTypedAsTextTool(r, tt.InsertTextTool(), tt.InsertText); err != nil {
 		return err
 	}
 	if err := RegisterTypedAsTextTool(r, tt.ReplaceTextTool(), tt.ReplaceText); err != nil {

texttool/inserttextlines.go

@@ -13,15 +13,15 @@ import (
 )
 
 const (
-	insertTextLinesFuncID spec.FuncID = "github.com/flexigpt/llmtools-go/texttool/inserttextlines.InsertTextLines"
-	whereBetween          string      = "between"
-	whereEnd              string      = "end"
+	insertTextFuncID spec.FuncID = "github.com/flexigpt/llmtools-go/texttool/inserttext.InsertText"
+	whereBetween     string      = "between"
+	whereEnd         string      = "end"
 )
 
-var insertTextLinesTool = spec.Tool{
+var insertTextTool = spec.Tool{
 	SchemaVersion: spec.SchemaVersion,
 	ID:            "019c04d3-572e-7d26-b4ca-f37feb7e8368",
-	Slug:          "inserttextlines",
+	Slug:          "inserttext",
 	Version:       "v1.0.0",
 	DisplayName:   "Insert text",
 	Description: "Insert a text block into a text file at the start, end, or between text. " +
@@ -65,13 +65,13 @@ var insertTextLinesTool = spec.Tool{
 "additionalProperties": false
 }`),
 
-	GoImpl: spec.GoToolImpl{FuncID: insertTextLinesFuncID},
+	GoImpl: spec.GoToolImpl{FuncID: insertTextFuncID},
 
 	CreatedAt:  spec.SchemaStartTime,
 	ModifiedAt: spec.SchemaStartTime,
 }
 
-type InsertTextLinesArgs struct {
+type InsertTextArgs struct {
 	Path      string  `json:"path"`
 	Text      *string `json:"text"`
 	Position  string  `json:"position"`
@@ -80,7 +80,7 @@ type InsertTextLinesArgs struct {
 	LineHint  *int    `json:"lineHint,omitempty"`
 }
 
-type InsertTextLinesOut struct {
+type InsertTextOut struct {
 	InsertedAtLine         int  `json:"insertedAtLine"` // 1-based, where insertion begins
 	InsertedLineCount      int  `json:"insertedLineCount"`
 	TextAboveMatchedAtLine *int `json:"textAboveMatchedAtLine,omitempty"` // 1-based start line of the matched textAbove boundary block used in the original file
@@ -94,7 +94,7 @@ func normalizeOptionalTextBlock(s *string) []string {
 	return ioutil.NormalizeTextBlockString(*s)
 }
 
-// insertTextLines inserts Text into a UTF‑8 file.
+// insertText inserts Text into a UTF‑8 file.
 // Behavior notes (entry point):
 //
 //   - File must exist, be regular, not a symlink, and valid UTF‑8.
@@ -104,11 +104,11 @@ func normalizeOptionalTextBlock(s *string) []string {
 //     and insertion occurs at the start of that blank gap.
 //   - The resulting insertion location must match exactly once; otherwise it fails.
 //   - Writes are atomic and preserve newline style and final newline presence.
-func insertTextLines(
+func insertText(
 	ctx context.Context,
-	args InsertTextLinesArgs,
+	args InsertTextArgs,
 	p fspolicy.FSPolicy,
-) (*InsertTextLinesOut, error) {
+) (*InsertTextOut, error) {
 	if err := ctx.Err(); err != nil {
 		return nil, err
 	}
@@ -171,7 +171,7 @@ func insertTextLines(
 		return nil, err
 	}
 
-	return &InsertTextLinesOut{
+	return &InsertTextOut{
 		InsertedAtLine:         insertAt + 1,
 		InsertedLineCount:      len(textToInsert),
 		TextAboveMatchedAtLine: textAboveAt,