fix: scope persisted cwd to current project

Only reuse a saved cwd when the current startup path matches the recorded project,
and document the project-scoped cwd behavior in the config docs.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: 王璨

README.md

@@ -76,7 +76,7 @@ node dist/dscode.mjs
 </tr>
 </table>
 
-> 欢迎大家在 GitHub 给项目点个 Star、Watch，顺手点赞支持。
+> 如果你喜欢这个项目，欢迎在 GitHub 点个 ⭐ Star、👀 Watch、👍 点赞支持！你的鼓励是我持续打磨 dscode 的动力，也非常感谢每一条反馈和建议。
 
 ### 首次启动
 
@@ -86,6 +86,7 @@ node dist/dscode.mjs
 ```
 
 `/config` 命令写入的配置会持久化到 `~/.dscode/config.json`，后续启动无需重复设置。
+其中 `cwd` 会记录本次启动对应的项目目录；只有在你手动执行 `/config cwd <path>` 时，才会对当前项目复用该目录。
 声明式配置单独放在 `settings.json`：用户级 `~/.dscode/settings.json`，项目级 `<project>/.dscode/settings.json`。
 
 ## What you get
@@ -125,7 +126,7 @@ dscode 通过 **MCP (Model Context Protocol)** 连接外部工具，把 DeepSeek
 /config model <id>          # 切换模型（即时生效）
 /config thinking <level>    # 设置思考强度
 /config key <api-key>       # 设置 API Key
-/config cwd <path>          # 设置工作目录（重启生效）
+/config cwd <path>          # 为当前项目设置工作目录（重启生效）
 /config help                # 查看帮助
 ```
 
@@ -257,7 +258,7 @@ Always push the branch before creating a PR.
 
 推荐把配置分成两类：
 
-- `/config` 命令写入的用户命令配置：`~/.dscode/config.json`
+- `/config` 命令写入的用户命令配置：`~/.dscode/config.json`（包含当前项目的 cwd 记录）
 - 声明式 settings：
   - 用户级：`~/.dscode/settings.json`
   - 项目级：`<project>/.dscode/settings.json`
@@ -270,7 +271,8 @@ Always push the branch before creating a PR.
 {
   "modelId": "deepseek-v4-flash",
   "thinkingLevel": "high",
-  "cwd": "/absolute/path/to/project"
+  "cwd": "/absolute/path/to/project/subdir",
+  "cwdProjectPath": "/absolute/path/to/project"
 }
 ```
 

docs/harness.md

@@ -235,7 +235,7 @@ function loadConfig(): HarnessConfig {
 }
 ```
 
-`/config` 命令写入的字段（如 `modelId` / `thinkingLevel` / `cwd` / `apiKey`）来自用户级 `~/.dscode/config.json`。
+`/config` 命令写入的字段（如 `modelId` / `thinkingLevel` / `cwd` / `cwdProjectPath` / `apiKey`）来自用户级 `~/.dscode/config.json`；其中 `cwd` 只会在启动项目与 `cwdProjectPath` 匹配时复用。
 `permissions` / `mcp` / `skills` 等声明式配置来自 `settings.json`，其中项目级 `settings.json` 覆盖用户级 `settings.json`。
 
 ## 模型切换

src/core/config.ts

@@ -60,6 +60,13 @@ export function saveUserConfig(partial: Record<string, unknown>): void {
   saveJsonSafe(path, { ...existing, ...partial });
 }
 
+export function saveUserProjectCwd(startupPath: string, cwd: string): void {
+  saveUserConfig({
+    cwd: resolve(cwd),
+    cwdProjectPath: resolve(startupPath),
+  });
+}
+
 export function loadConfig(): HarnessConfig {
   const startupPath = resolve(process.env.DSCODE_PROJECT_PATH ?? process.cwd());
   const configDir = dsConfigHome();
@@ -70,13 +77,21 @@ export function loadConfig(): HarnessConfig {
 
   let projectPath = startupPath;
   const configuredCwd = userConfig.cwd;
-  if (typeof configuredCwd === "string" && configuredCwd.trim() !== "") {
+  const configuredCwdProjectPath = userConfig.cwdProjectPath;
+  if (
+    typeof configuredCwd === "string" &&
+    configuredCwd.trim() !== "" &&
+    typeof configuredCwdProjectPath === "string" &&
+    resolve(configuredCwdProjectPath) === startupPath
+  ) {
     const nextProjectPath = resolve(configuredCwd);
     if (existsSync(nextProjectPath)) {
       projectPath = nextProjectPath;
     }
   }
 
+  saveUserProjectCwd(startupPath, projectPath);
+
   if (projectPath !== process.cwd()) {
     process.chdir(projectPath);
   }
@@ -148,6 +163,7 @@ export function loadConfig(): HarnessConfig {
     apiKey,
     thinkingLevel,
     maxTokens,
+    startupPath,
     projectPath,
     configDir,
     dataDir,

src/core/types.ts

@@ -12,6 +12,7 @@ export interface HarnessConfig {
   apiKey?: string;
   thinkingLevel: ThinkingLevel;
   maxTokens: number;
+  startupPath: string;
   projectPath: string;
   configDir: string;
   dataDir: string;

src/ui/commands.ts

@@ -13,7 +13,7 @@ import type { PermissionManager } from "../permissions/manager.js";
 import type { ContextManager } from "../context/manager.js";
 import type { MCPManager } from "../mcp/manager.js";
 import type { TuiApp } from "./tui-app.js";
-import { saveUserConfig, maskApiKey } from "../core/config.js";
+import { saveUserConfig, saveUserProjectCwd, maskApiKey } from "../core/config.js";
 import { readImageFile, readClipboardImage } from "../utils/image.js";
 
 interface CommandContext {
@@ -253,7 +253,7 @@ const COMMANDS: SlashCommandDef[] = [
             "/config model <id>       Switch model (saved to ~/.dscode/config.json)",
             "/config thinking <level> Set thinking level (saved to ~/.dscode/config.json)",
             "/config key <api-key>    Set your DeepSeek API key",
-            "/config cwd <path>       Set working directory (saved to ~/.dscode/config.json)",
+            "/config cwd <path>       Set working directory for this project (saved to ~/.dscode/config.json)",
             "/config help             Show this help",
           ].join("\n"));
           break;
@@ -275,8 +275,8 @@ const COMMANDS: SlashCommandDef[] = [
             return;
           }
           const resolvedCwd = resolve(cwd);
-          saveUserConfig({ cwd: resolvedCwd });
-          ctx.tui.addInfo(`CWD set to: ${resolvedCwd} (saved to ~/.dscode/config.json, restart required)`);
+          saveUserProjectCwd(ctx.config.startupPath, resolvedCwd);
+          ctx.tui.addInfo(`CWD set to: ${resolvedCwd} (saved to ~/.dscode/config.json for this project, restart required)`);
           break;
         }
         case "key": {

tests/core/config.test.ts

@@ -21,7 +21,29 @@ describe("config and settings loading", () => {
     else process.env.DSCODE_DATA_HOME = originalDataHome;
   });
 
-  it("switches projectPath using user config cwd on restart", () => {
+  it("defaults to startup path and records it in user config", () => {
+    const root = mkdtempSync(join(tmpdir(), "dscode-config-"));
+    const configHome = join(root, "home");
+    const workspace = join(root, "workspace");
+
+    mkdirSync(configHome, { recursive: true });
+    mkdirSync(workspace, { recursive: true });
+
+    process.env.DSCODE_PROJECT_PATH = workspace;
+    process.env.DSCODE_CONFIG_HOME = configHome;
+    process.env.DSCODE_DATA_HOME = configHome;
+
+    const config = loadConfig();
+    const saved = JSON.parse(readFileSync(join(configHome, "config.json"), "utf8"));
+
+    expect(realpathSync(config.projectPath)).toBe(realpathSync(workspace));
+    expect(realpathSync(process.cwd())).toBe(realpathSync(workspace));
+    expect(saved).toMatchObject({ cwd: workspace, cwdProjectPath: workspace });
+
+    rmSync(root, { recursive: true, force: true });
+  });
+
+  it("switches projectPath using persisted cwd for the same startup project", () => {
     const root = mkdtempSync(join(tmpdir(), "dscode-config-"));
     const configHome = join(root, "home");
     const workspace = join(root, "workspace");
@@ -31,7 +53,7 @@ describe("config and settings loading", () => {
     mkdirSync(target, { recursive: true });
     writeFileSync(
       join(configHome, "config.json"),
-      JSON.stringify({ cwd: target, modelId: "deepseek-v4-pro" }) + "\n",
+      JSON.stringify({ cwd: target, cwdProjectPath: workspace, modelId: "deepseek-v4-pro" }) + "\n",
       "utf8",
     );
 
@@ -48,7 +70,36 @@ describe("config and settings loading", () => {
     rmSync(root, { recursive: true, force: true });
   });
 
-  it("keeps startup path when user config cwd does not exist", () => {
+  it("keeps startup path when persisted cwd belongs to another startup project", () => {
+    const root = mkdtempSync(join(tmpdir(), "dscode-config-"));
+    const configHome = join(root, "home");
+    const workspace = join(root, "workspace");
+    const otherWorkspace = join(root, "other-workspace");
+    const target = join(workspace, "nested-project");
+
+    mkdirSync(configHome, { recursive: true });
+    mkdirSync(workspace, { recursive: true });
+    mkdirSync(otherWorkspace, { recursive: true });
+    mkdirSync(target, { recursive: true });
+    writeFileSync(
+      join(configHome, "config.json"),
+      JSON.stringify({ cwd: target, cwdProjectPath: workspace }) + "\n",
+      "utf8",
+    );
+
+    process.env.DSCODE_PROJECT_PATH = otherWorkspace;
+    process.env.DSCODE_CONFIG_HOME = configHome;
+    process.env.DSCODE_DATA_HOME = configHome;
+
+    const config = loadConfig();
+
+    expect(realpathSync(config.projectPath)).toBe(realpathSync(otherWorkspace));
+    expect(realpathSync(process.cwd())).toBe(realpathSync(otherWorkspace));
+
+    rmSync(root, { recursive: true, force: true });
+  });
+
+  it("keeps startup path when persisted cwd does not exist", () => {
     const root = mkdtempSync(join(tmpdir(), "dscode-config-"));
     const configHome = join(root, "home");
     const workspace = join(root, "workspace");
@@ -57,7 +108,7 @@ describe("config and settings loading", () => {
     mkdirSync(workspace, { recursive: true });
     writeFileSync(
       join(configHome, "config.json"),
-      JSON.stringify({ cwd: join(workspace, "missing") }) + "\n",
+      JSON.stringify({ cwd: join(workspace, "missing"), cwdProjectPath: workspace }) + "\n",
       "utf8",
     );
 
@@ -115,10 +166,11 @@ describe("config and settings loading", () => {
     process.env.DSCODE_CONFIG_HOME = configHome;
     process.env.DSCODE_DATA_HOME = configHome;
 
-    saveUserConfig({ modelId: "deepseek-v4-pro", cwd: "/tmp/project" });
+    saveUserConfig({ modelId: "deepseek-v4-pro" });
 
     const saved = JSON.parse(readFileSync(join(configHome, "config.json"), "utf8"));
-    expect(saved).toMatchObject({ modelId: "deepseek-v4-pro", cwd: "/tmp/project" });
+    expect(saved).toMatchObject({ modelId: "deepseek-v4-pro" });
+    expect(saved.cwd).toBeUndefined();
 
     rmSync(root, { recursive: true, force: true });
   });