fix(tools): fix TS type errors for no-op write/edit results

zw-xysk · zw-xysk · commit 5265d8e32de6 · 2026-06-26T18:48:09.000+08:00
- Add explicit 'details: undefined' to no-op returns (AgentToolResult requires details) - Fix test type narrowing for 'text' property access on result.content[0] - Keep existing behavior for real changes Fixes #96983 Signed-off-by: 赵旺0668001248 <0668001248@duomai.com>
diff --git a/src/agents/sessions/tools/edit.test.ts b/src/agents/sessions/tools/edit.test.ts
@@ -191,7 +191,8 @@ describe("edit tool", () => {
       undefined,
     );
 
-    expect(result.content[0].text).toContain("No changes made");
+    const textContent = result.content[0];
+    expect("text" in textContent ? textContent.text : "").toContain("No changes made");
     // File must not be rewritten
     await expect(fs.readFile(filePath, "utf-8")).resolves.toBe("unchanged content\n");
   });
@@ -209,7 +210,8 @@ describe("edit tool", () => {
       undefined,
     );
 
-    expect(result.content[0].text).toContain("Successfully replaced");
+    const textContent = result.content[0];
+    expect("text" in textContent ? textContent.text : "").toContain("Successfully replaced");
     await expect(fs.readFile(filePath, "utf-8")).resolves.toBe("new content\n");
   });
 });
diff --git a/src/agents/sessions/tools/edit.ts b/src/agents/sessions/tools/edit.ts
@@ -487,6 +487,7 @@ export function createEditToolDefinition(
                   text: `No changes made to ${path}. The replacement produced identical content.`,
                 },
               ],
+              details: undefined,
             };
           }
           throw normalizedError;
diff --git a/src/agents/sessions/tools/write.test.ts b/src/agents/sessions/tools/write.test.ts
@@ -134,8 +134,9 @@ describe("write tool", () => {
       undefined,
     );
 
-    expect(result.content[0].text).toContain("No changes made");
-    expect(result.content[0].text).toContain("identical");
+    const textContent = result.content[0];
+    expect("text" in textContent ? textContent.text : "").toContain("No changes made");
+    expect("text" in textContent ? textContent.text : "").toContain("identical");
     // File content must not change
     await expect(fs.readFile(filePath, "utf-8")).resolves.toBe("hello\n");
   });
@@ -151,7 +152,8 @@ describe("write tool", () => {
       undefined,
     );
 
-    expect(result.content[0].text).toContain("Successfully wrote");
+    const textContent = result.content[0];
+    expect("text" in textContent ? textContent.text : "").toContain("Successfully wrote");
     await expect(fs.readFile(filePath, "utf-8")).resolves.toBe("new\n");
   });
 });
diff --git a/src/agents/sessions/tools/write.ts b/src/agents/sessions/tools/write.ts
@@ -417,6 +417,7 @@ export function createWriteToolDefinition(
                   text: `No changes made to ${path}. File content is identical.`,
                 },
               ],
+              details: undefined,
             };
           }
           await ops.mkdir(dir);

Original file line number	Diff line number	Diff line change
`@@ -487,6 +487,7 @@ export function createEditToolDefinition(`
`487`	`487`	text: `No changes made to ${path}. The replacement produced identical content.`,
`488`	`488`	`},`
`489`	`489`	`],`
	`490`	`+ details: undefined,`
`490`	`491`	`};`
`491`	`492`	`}`
`492`	`493`	`throw normalizedError;`
Original file line number	Diff line number	Diff line change
`@@ -417,6 +417,7 @@ export function createWriteToolDefinition(`
`417`	`417`	text: `No changes made to ${path}. File content is identical.`,
`418`	`418`	`},`
`419`	`419`	`],`
	`420`	`+ details: undefined,`
`420`	`421`	`};`
`421`	`422`	`}`
`422`	`423`	`await ops.mkdir(dir);`