Merge branch 'lessweb:main' into main

Author: hqwlkj

src/common/state.ts

@@ -493,18 +493,17 @@ export function getTools(_options: PromptToolOptions = {}, externalTools: ToolDe
         parameters: {
           type: "object",
           properties: {
-            file_path: {
+            snippet_id: {
               type: "string",
-              description: "Absolute path to file. Optional when snippet_id is provided.",
+              description: "Required Read/Edit snippet_id.",
             },
-            snippet_id: {
+            file_path: {
               type: "string",
-              description:
-                "Snippet id returned by the Read or Edit tool to scope the search range after a partial read.",
+              description: "Optional absolute path guard; must match snippet_id's file.",
             },
             old_string: {
               type: "string",
-              description: "Exact text to replace inside the file or snippet scope",
+              description: "Exact text to replace inside snippet_id's scope",
             },
             new_string: {
               type: "string",
@@ -520,7 +519,7 @@ export function getTools(_options: PromptToolOptions = {}, externalTools: ToolDe
               description: "Expected number of matches, especially useful as a safety check with replace_all",
             },
           },
-          required: ["old_string", "new_string"],
+          required: ["snippet_id", "old_string", "new_string"],
           additionalProperties: false,
         },
       },

src/prompt.ts

@@ -31,7 +31,7 @@ import { logApiError } from "./common/error-logger";
 import { logOpenAIChatCompletionDebug, normalizeDebugError } from "./common/debug-logger";
 import { killProcessTree } from "./common/process-tree";
 import { GitFileHistory } from "./common/file-history";
-import { getSnippet } from "./common/state";
+import { clearSessionState, getSnippet, rebuildSessionStateFromHistory } from "./common/state";
 import {
   appendProjectPermissionAllows,
   buildPermissionToolExecution,
@@ -45,7 +45,6 @@ import {
   type UserToolPermission,
 } from "./common/permissions";
 import { clearSessionWorkingDir } from "./tools/bash-handler";
-import { clearSessionState } from "./common/state";
 
 export type { PermissionScope } from "./settings";
 export type {
@@ -1143,6 +1142,7 @@ ${skillMd}
     const { client, model, baseURL, thinkingEnabled, reasoningEffort, debugLogEnabled, notify, env } =
       this.createOpenAIClient();
     const now = new Date().toISOString();
+    rebuildSessionStateFromHistory(sessionId, this.listSessionMessages(sessionId));
 
     if (!client) {
       this.updateSessionEntry(sessionId, (entry) => ({
@@ -2547,6 +2547,12 @@ ${skillMd}
       return typeof args.explanation === "string" ? args.explanation.trim() : "";
     } else if (toolName === "write") {
       return typeof args.file_path === "string" ? args.file_path.trim() : "";
+    } else if (toolName === "edit") {
+      const filePath = typeof args.file_path === "string" ? args.file_path.trim() : "";
+      if (filePath) {
+        return filePath;
+      }
+      return typeof args.snippet_id === "string" ? args.snippet_id.trim() : "";
     }
 
     const firstKey = Object.keys(args)[0];

src/session.ts

@@ -86,18 +86,62 @@ test("scanFileMentionItems returns relative slash-separated files and directorie
   try {
     fs.mkdirSync(path.join(root, "src"));
     fs.writeFileSync(path.join(root, "src", "index.ts"), "");
-    fs.mkdirSync(path.join(root, "node_modules"));
-    fs.writeFileSync(path.join(root, "node_modules", "ignored.js"), "");
+    fs.mkdirSync(path.join(root, "vendor"));
+    fs.writeFileSync(path.join(root, "vendor", "dep.js"), "");
 
     assert.deepEqual(
       scanFileMentionItems(root).map((item) => item.path),
-      ["node_modules/", "node_modules/ignored.js", "src/", "src/index.ts"]
+      ["src/", "src/index.ts", "vendor/", "vendor/dep.js"]
     );
   } finally {
     fs.rmSync(root, { recursive: true, force: true });
   }
 });
 
+test("scanFileMentionItems applies default noisy-directory ignores when no gitignore is applicable", () => {
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), "deepcode-file-mentions-"));
+  try {
+    for (const directory of [
+      ".next",
+      ".pytest_cache",
+      ".ruff_cache",
+      "__pycache__",
+      "build",
+      "dist",
+      "node_modules",
+      "out",
+      "target",
+    ]) {
+      fs.mkdirSync(path.join(root, directory));
+      fs.writeFileSync(path.join(root, directory, "ignored.txt"), "");
+    }
+    fs.mkdirSync(path.join(root, ".config"));
+    fs.writeFileSync(path.join(root, ".config", "settings.json"), "");
+    fs.mkdirSync(path.join(root, "src"));
+    fs.writeFileSync(path.join(root, "src", "index.ts"), "");
+
+    assert.deepEqual(
+      scanFileMentionItems(root).map((item) => item.path),
+      [".config/", ".config/settings.json", "src/", "src/index.ts"]
+    );
+  } finally {
+    fs.rmSync(root, { recursive: true, force: true });
+  }
+});
+
+test("scanFileMentionItems default max item cap is above 2000", () => {
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), "deepcode-file-mentions-"));
+  try {
+    for (let index = 0; index < 2001; index++) {
+      fs.writeFileSync(path.join(root, `file-${index.toString().padStart(4, "0")}.txt`), "");
+    }
+
+    assert.equal(scanFileMentionItems(root).length, 2001);
+  } finally {
+    fs.rmSync(root, { recursive: true, force: true });
+  }
+});
+
 test("scanFileMentionItems respects project gitignore patterns inside git repositories", () => {
   const root = fs.mkdtempSync(path.join(os.tmpdir(), "deepcode-file-mentions-"));
   try {

src/tests/file-mentions.test.ts

@@ -5,6 +5,7 @@ import * as fs from "fs";
 import * as os from "os";
 import * as path from "path";
 import { GitFileHistory } from "../common/file-history";
+import { clearSessionState } from "../common/state";
 import { type SessionMessage } from "../session";
 import { SessionManager } from "../session";
 
@@ -1257,6 +1258,75 @@ test("replySession /continue runs trailing pending tool calls before requesting
   );
 });
 
+test("replySession rebuilds snippet state from persisted read history before editing", async () => {
+  const workspace = createTempDir("deepcode-rebuild-snippet-workspace-");
+  const home = createTempDir("deepcode-rebuild-snippet-home-");
+  setHomeDir(home);
+
+  const filePath = path.join(workspace, "note.txt");
+  fs.writeFileSync(filePath, "alpha\nbeta\n", "utf8");
+
+  const responses = [
+    createToolCallResponse(
+      [
+        {
+          id: "call-edit",
+          type: "function",
+          function: {
+            name: "edit",
+            arguments: JSON.stringify({
+              snippet_id: "full_file_5",
+              file_path: filePath,
+              old_string: "beta",
+              new_string: "gamma",
+            }),
+          },
+        },
+      ],
+      { prompt_tokens: 1, completion_tokens: 1, total_tokens: 2 }
+    ),
+    createChatResponse("done", { prompt_tokens: 1, completion_tokens: 1, total_tokens: 2 }),
+  ];
+  const manager = createMockedClientSessionManager(workspace, responses);
+  const originalActivateSession = manager.activateSession.bind(manager);
+  (manager as any).activateSession = async () => {};
+
+  const sessionId = await manager.createSession({ text: "first prompt" });
+  const readToolMessage = (manager as any).buildToolMessage(
+    sessionId,
+    "call-read",
+    JSON.stringify({
+      ok: true,
+      name: "read",
+      output: "     1\talpha\n     2\tbeta\n",
+      metadata: {
+        snippet: {
+          id: "full_file_5",
+          filePath,
+          startLine: 1,
+          endLine: 3,
+        },
+      },
+    }),
+    { name: "read", arguments: JSON.stringify({ file_path: filePath }) }
+  ) as SessionMessage;
+  (manager as any).appendSessionMessage(sessionId, readToolMessage);
+
+  clearSessionState(sessionId);
+  (manager as any).activateSession = originalActivateSession;
+
+  await manager.replySession(sessionId, { text: "change beta" });
+
+  assert.equal(fs.readFileSync(filePath, "utf8"), "alpha\ngamma\n");
+  const editToolMessage = manager.listSessionMessages(sessionId).find((message) => {
+    const params = message.messageParams as { tool_call_id?: string } | null;
+    return message.role === "tool" && params?.tool_call_id === "call-edit";
+  });
+  assert.ok(editToolMessage);
+  assert.match(editToolMessage.content ?? "", /"ok":true|"ok": true/);
+  assert.doesNotMatch(editToolMessage.content ?? "", /Unknown snippet_id/);
+});
+
 test("activateSession pauses for permission when a tool call requires ask", async () => {
   const workspace = createTempDir("deepcode-permission-ask-workspace-");
   const home = createTempDir("deepcode-permission-ask-home-");
@@ -2712,6 +2782,13 @@ function createChatResponse(content: string, usage: Record<string, unknown>): un
   };
 }
 
+function createToolCallResponse(toolCalls: unknown[], usage: Record<string, unknown>): unknown {
+  return {
+    choices: [{ message: { content: "", tool_calls: toolCalls } }],
+    usage,
+  };
+}
+
 function buildTestMessage(
   id: string,
   sessionId: string,