@jingyi0605/codingns 0.3.6 → 0.5.0

package/dist/server/modules/workbench/workspace-file-watcher.js

@@ -3,6 +3,7 @@ import path from "node:path";
 import chokidar from "chokidar";
 import ignore from "ignore";
 const DEBOUNCE_MS = 500;
+const GIT_REF_WATCH_DEPTH = 8;
 /**
  * 工作区文件监听服务。
  *
@@ -17,7 +18,9 @@ const DEBOUNCE_MS = 500;
  */
 export class WorkspaceFileWatcher {
     workspaceService;
-    watchers = new Map();
+    fileTreeWatchers = new Map();
+    gitWatchers = new Map();
+    debounceTimers = new Map();
     onChange = null;
     constructor(workspaceService) {
         this.workspaceService = workspaceService;
@@ -26,77 +29,120 @@ export class WorkspaceFileWatcher {
         this.onChange = callback;
     }
     /**
-     * 为指定工作区启动文件监听。内部使用引用计数，多个订阅者共享同一个 watcher。
+     * 文件树监听只盯当前展开目录，避免默认递归监听整个工作区。
      */
-    subscribe(workspaceId) {
-        const existing = this.watchers.get(workspaceId);
-        if (existing) {
-            existing.subscriberCount++;
-            return;
-        }
+    subscribeFileTree(workspaceId, paths) {
         const workspace = this.workspaceService.getWorkspaceOrThrow(workspaceId);
         const ig = loadGitignoreRules(workspace.path);
-        const watcher = chokidar.watch(workspace.path, {
-            ignored: (absolutePath) => {
-                // chokidar 传入绝对路径，转为相对路径后用 ignore 库匹配
-                const relative = path.relative(workspace.path, absolutePath);
-                if (!relative) {
-                    return false;
-                }
-                return ig.ignores(relative);
-            },
-            ignoreInitial: true,
-            ignorePermissionErrors: true,
-            persistent: true
-        });
-        const entry = {
-            watcher,
-            debounceTimer: null,
-            subscriberCount: 1
-        };
-        watcher.on("all", () => {
-            this.scheduleRefresh(workspaceId);
-        });
-        this.watchers.set(workspaceId, entry);
+        for (const normalizedPath of normalizeWatchPaths(paths)) {
+            const key = `${workspaceId}::${normalizedPath}`;
+            const existing = this.fileTreeWatchers.get(key);
+            if (existing) {
+                existing.subscriberCount += 1;
+                continue;
+            }
+            const watchTarget = resolveFileTreeWatchTarget(workspace.path, normalizedPath);
+            const watcher = chokidar.watch(watchTarget, {
+                depth: 0,
+                ignored: (absolutePath) => shouldIgnoreWorkspacePath(workspace.path, ig, absolutePath),
+                ignoreInitial: true,
+                ignorePermissionErrors: true,
+                persistent: true
+            });
+            watcher.on("all", () => {
+                this.scheduleRefresh(workspaceId, "fileTree");
+            });
+            this.fileTreeWatchers.set(key, {
+                watcher,
+                subscriberCount: 1
+            });
+        }
     }
     /**
-     * 取消订阅。引用计数归零时自动关闭 watcher。
+     * Git 监听只盯 `.git` 元数据和 worktree 相关的 gitdir/commondir。
      */
-    unsubscribe(workspaceId) {
-        const entry = this.watchers.get(workspaceId);
-        if (!entry) {
-            return;
-        }
-        entry.subscriberCount--;
-        if (entry.subscriberCount <= 0) {
-            entry.watcher.close();
-            if (entry.debounceTimer) {
-                clearTimeout(entry.debounceTimer);
+    subscribeGit(workspaceId) {
+        const workspace = this.workspaceService.getWorkspaceOrThrow(workspaceId);
+        for (const target of resolveGitWatchTargets(workspace)) {
+            const key = `${workspaceId}::${target.path}`;
+            const existing = this.gitWatchers.get(key);
+            if (existing) {
+                existing.subscriberCount += 1;
+                continue;
             }
-            this.watchers.delete(workspaceId);
+            const watcher = chokidar.watch(target.path, {
+                depth: target.depth,
+                ignoreInitial: true,
+                ignorePermissionErrors: true,
+                persistent: true
+            });
+            watcher.on("all", () => {
+                this.scheduleRefresh(workspaceId, "git");
+            });
+            this.gitWatchers.set(key, {
+                watcher,
+                subscriberCount: 1
+            });
         }
     }
-    scheduleRefresh(workspaceId) {
-        const entry = this.watchers.get(workspaceId);
-        if (!entry) {
-            return;
+    unsubscribeFileTree(workspaceId, paths) {
+        for (const normalizedPath of normalizeWatchPaths(paths)) {
+            const key = `${workspaceId}::${normalizedPath}`;
+            const entry = this.fileTreeWatchers.get(key);
+            if (!entry) {
+                continue;
+            }
+            entry.subscriberCount -= 1;
+            if (entry.subscriberCount <= 0) {
+                void entry.watcher.close();
+                this.fileTreeWatchers.delete(key);
+            }
         }
-        if (entry.debounceTimer) {
-            clearTimeout(entry.debounceTimer);
+    }
+    unsubscribeGit(workspaceId) {
+        for (const key of [...this.gitWatchers.keys()]) {
+            if (!key.startsWith(`${workspaceId}::`)) {
+                continue;
+            }
+            const entry = this.gitWatchers.get(key);
+            if (!entry) {
+                continue;
+            }
+            entry.subscriberCount -= 1;
+            if (entry.subscriberCount <= 0) {
+                void entry.watcher.close();
+                this.gitWatchers.delete(key);
+            }
         }
-        entry.debounceTimer = setTimeout(() => {
-            entry.debounceTimer = null;
-            this.onChange?.(workspaceId);
+    }
+    scheduleRefresh(workspaceId, scope) {
+        const key = `${scope}::${workspaceId}`;
+        const existingTimer = this.debounceTimers.get(key);
+        if (existingTimer) {
+            clearTimeout(existingTimer);
+        }
+        const timer = setTimeout(() => {
+            this.debounceTimers.delete(key);
+            this.onChange?.({
+                workspaceId,
+                scope
+            });
         }, DEBOUNCE_MS);
+        this.debounceTimers.set(key, timer);
     }
     dispose() {
-        for (const entry of this.watchers.values()) {
-            entry.watcher.close();
-            if (entry.debounceTimer) {
-                clearTimeout(entry.debounceTimer);
-            }
+        for (const entry of this.fileTreeWatchers.values()) {
+            void entry.watcher.close();
+        }
+        for (const entry of this.gitWatchers.values()) {
+            void entry.watcher.close();
         }
-        this.watchers.clear();
+        for (const timer of this.debounceTimers.values()) {
+            clearTimeout(timer);
+        }
+        this.fileTreeWatchers.clear();
+        this.gitWatchers.clear();
+        this.debounceTimers.clear();
     }
 }
 /**
@@ -134,4 +180,168 @@ function loadGitignoreRules(workspacePath) {
     }
     return ig;
 }
+function normalizeWatchPaths(paths) {
+    const uniquePaths = new Set();
+    for (const value of paths.length > 0 ? paths : [""]) {
+        uniquePaths.add(normalizePanelPath(value));
+    }
+    return [...uniquePaths];
+}
+function normalizePanelPath(value) {
+    return value.trim().replace(/\\/g, "/").replace(/^\/+|\/+$/g, "");
+}
+function shouldIgnoreWorkspacePath(workspacePath, ig, absolutePath) {
+    const relative = path.relative(workspacePath, absolutePath);
+    if (!relative) {
+        return false;
+    }
+    return ig.ignores(relative);
+}
+function resolveFileTreeWatchTarget(workspacePath, relativePath) {
+    const workspaceRoot = path.resolve(workspacePath);
+    let currentPath = path.resolve(workspaceRoot, relativePath || ".");
+    while (isPathInside(currentPath, workspaceRoot)) {
+        if (fs.existsSync(currentPath)) {
+            try {
+                if (fs.statSync(currentPath).isDirectory()) {
+                    return currentPath;
+                }
+            }
+            catch {
+                return path.dirname(currentPath);
+            }
+            return path.dirname(currentPath);
+        }
+        const parentPath = path.dirname(currentPath);
+        if (parentPath === currentPath) {
+            break;
+        }
+        currentPath = parentPath;
+    }
+    return workspaceRoot;
+}
+function resolveGitWatchTargets(workspace) {
+    const targets = new Set();
+    const workspaceRoot = path.resolve(workspace.path);
+    const gitEntry = path.join(workspaceRoot, ".git");
+    addExistingFileWatchTarget(targets, gitEntry);
+    const repoRootEntry = workspace.repoRoot && path.resolve(workspace.repoRoot) !== workspaceRoot
+        ? path.join(path.resolve(workspace.repoRoot), ".git")
+        : null;
+    addExistingFileWatchTarget(targets, repoRootEntry);
+    const candidateGitDirs = [gitEntry, repoRootEntry].filter((value) => Boolean(value));
+    for (const candidate of candidateGitDirs) {
+        const resolvedGitDir = resolveGitDirectory(candidate);
+        if (!resolvedGitDir) {
+            continue;
+        }
+        addGitMetadataWatchTargets(targets, resolvedGitDir);
+        const commonDir = resolveGitCommonDirectory(resolvedGitDir);
+        if (commonDir) {
+            addGitMetadataWatchTargets(targets, commonDir);
+        }
+    }
+    return [...targets].map((targetPath) => ({
+        path: targetPath,
+        depth: isGitRefDirectory(targetPath) ? GIT_REF_WATCH_DEPTH : 0
+    }));
+}
+function resolveGitDirectory(gitEntryPath) {
+    if (!fs.existsSync(gitEntryPath)) {
+        return null;
+    }
+    try {
+        const stat = fs.statSync(gitEntryPath);
+        if (stat.isDirectory()) {
+            return gitEntryPath;
+        }
+        if (!stat.isFile()) {
+            return null;
+        }
+        const content = fs.readFileSync(gitEntryPath, "utf-8");
+        const gitDirLine = content
+            .split(/\r?\n/)
+            .find((line) => line.trim().toLowerCase().startsWith("gitdir:"));
+        if (!gitDirLine) {
+            return null;
+        }
+        const rawGitDir = gitDirLine.slice(gitDirLine.indexOf(":") + 1).trim();
+        if (!rawGitDir) {
+            return null;
+        }
+        return path.resolve(path.dirname(gitEntryPath), rawGitDir);
+    }
+    catch {
+        return null;
+    }
+}
+function resolveGitCommonDirectory(gitDirectory) {
+    const commonDirPath = path.join(gitDirectory, "commondir");
+    if (!fs.existsSync(commonDirPath)) {
+        return null;
+    }
+    try {
+        const rawValue = fs.readFileSync(commonDirPath, "utf-8").trim();
+        if (!rawValue) {
+            return null;
+        }
+        return path.resolve(gitDirectory, rawValue);
+    }
+    catch {
+        return null;
+    }
+}
+function addGitMetadataWatchTargets(targets, gitDirectory) {
+    addExistingFileWatchTarget(targets, path.join(gitDirectory, "HEAD"));
+    addExistingFileWatchTarget(targets, path.join(gitDirectory, "index"));
+    addExistingFileWatchTarget(targets, path.join(gitDirectory, "packed-refs"));
+    addExistingFileWatchTarget(targets, path.join(gitDirectory, "FETCH_HEAD"));
+    addExistingFileWatchTarget(targets, path.join(gitDirectory, "ORIG_HEAD"));
+    addExistingFileWatchTarget(targets, path.join(gitDirectory, "MERGE_HEAD"));
+    addExistingFileWatchTarget(targets, path.join(gitDirectory, "REBASE_HEAD"));
+    addExistingFileWatchTarget(targets, path.join(gitDirectory, "CHERRY_PICK_HEAD"));
+    addExistingFileWatchTarget(targets, path.join(gitDirectory, "logs", "HEAD"));
+    addExistingDirectoryWatchTarget(targets, path.join(gitDirectory, "refs", "heads"));
+    addExistingDirectoryWatchTarget(targets, path.join(gitDirectory, "refs", "remotes"));
+    addExistingDirectoryWatchTarget(targets, path.join(gitDirectory, "rebase-merge"));
+    addExistingDirectoryWatchTarget(targets, path.join(gitDirectory, "rebase-apply"));
+}
+function addExistingFileWatchTarget(targets, targetPath) {
+    if (!targetPath || !fs.existsSync(targetPath)) {
+        return;
+    }
+    try {
+        const resolvedPath = path.resolve(targetPath);
+        if (fs.statSync(resolvedPath).isFile()) {
+            targets.add(resolvedPath);
+        }
+    }
+    catch {
+        // 忽略不存在或无法访问的路径
+    }
+}
+function addExistingDirectoryWatchTarget(targets, targetPath) {
+    if (!targetPath || !fs.existsSync(targetPath)) {
+        return;
+    }
+    try {
+        const resolvedPath = path.resolve(targetPath);
+        if (fs.statSync(resolvedPath).isDirectory()) {
+            targets.add(resolvedPath);
+        }
+    }
+    catch {
+        // 忽略不存在或无法访问的路径
+    }
+}
+function isGitRefDirectory(targetPath) {
+    return (targetPath.endsWith(`${path.sep}refs${path.sep}heads`) ||
+        targetPath.endsWith(`${path.sep}refs${path.sep}remotes`));
+}
+function isPathInside(candidate, parent) {
+    const normalizedCandidate = path.resolve(candidate);
+    const normalizedParent = path.resolve(parent);
+    return (normalizedCandidate === normalizedParent ||
+        normalizedCandidate.startsWith(`${normalizedParent}${path.sep}`));
+}
 //# sourceMappingURL=workspace-file-watcher.js.map

package/dist/server/modules/workbench/workspace-file-watcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-file-watcher.js","sourceRoot":"","sources":["../../../../src/modules/workbench/workspace-file-watcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace-file-watcher.js","sourceRoot":"","sources":["../../../../src/modules/workbench/workspace-file-watcher.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/workbench/workspace-panel-snapshot-service.d.ts

@@ -40,6 +40,7 @@ export declare class WorkspacePanelSnapshotService {
     private readonly taskManager;
     private readonly fileTreeCache;
     private readonly gitSnapshotCache;
+    private readonly gitRefreshStates;
     private readonly terminalManagerCache;
     private readonly workspaceManagementCache;
     private readonly fileTreeInflight;
@@ -65,6 +66,7 @@ export declare class WorkspacePanelSnapshotService {
     invalidateGit(workspaceId: string): void;
     invalidateTerminalManager(workspaceId: string): void;
     invalidateWorkspaceManagement(workspaceId: string): void;
+    private getOrCreateGitRefreshState;
     private registerBackgroundTasks;
     private loadTerminalManagerSnapshot;
 }

package/dist/server/modules/workbench/workspace-panel-snapshot-service.js

@@ -16,6 +16,7 @@ export class WorkspacePanelSnapshotService {
     taskManager;
     fileTreeCache = new Map();
     gitSnapshotCache = new Map();
+    gitRefreshStates = new Map();
     terminalManagerCache = new Map();
     workspaceManagementCache = new Map();
     fileTreeInflight = new Map();
@@ -61,14 +62,27 @@ export class WorkspacePanelSnapshotService {
     }
     async getGitPanelSnapshot(workspaceId, options) {
         const cached = this.gitSnapshotCache.get(workspaceId);
-        if (!options?.force && cached && !isExpired(cached.cachedAt, GIT_SNAPSHOT_CACHE_MAX_AGE_MS)) {
+        const refreshState = this.getOrCreateGitRefreshState(workspaceId);
+        const needsRefresh = options?.force
+            || refreshState.dirtyVersion !== refreshState.lastCompletedDirtyVersion
+            || !cached
+            || isExpired(cached.cachedAt, GIT_SNAPSHOT_CACHE_MAX_AGE_MS);
+        if (!needsRefresh && cached) {
             return cached.snapshot;
         }
         const inflight = this.gitInflight.get(workspaceId);
         if (inflight) {
-            return await awaitAbortableInflightTask(inflight, options?.signal);
+            // 已经取消但还没从 inflight 表里清掉的任务不能复用，
+            // 否则新的订阅会接到旧任务的 abort 结果，误报成内部错误。
+            if (inflight.controller.signal.aborted) {
+                this.gitInflight.delete(workspaceId);
+            }
+            else {
+                return await awaitAbortableInflightTask(inflight, options?.signal);
+            }
         }
         const controller = new AbortController();
+        const startedDirtyVersion = refreshState.dirtyVersion;
         const task = {
             controller,
             consumerCount: 0,
@@ -83,6 +97,7 @@ export class WorkspacePanelSnapshotService {
                         snapshot: cached.snapshot,
                         cachedAt: Date.now()
                     });
+                    refreshState.lastCompletedDirtyVersion = startedDirtyVersion;
                     return cached.snapshot;
                 }
                 // 状态有变化，执行完整刷新（复用已获取的 status）
@@ -102,6 +117,7 @@ export class WorkspacePanelSnapshotService {
                     snapshot,
                     cachedAt: Date.now()
                 });
+                refreshState.lastCompletedDirtyVersion = startedDirtyVersion;
                 return snapshot;
             })().finally(() => {
                 task.settled = true;
@@ -172,7 +188,8 @@ export class WorkspacePanelSnapshotService {
         }
     }
     invalidateGit(workspaceId) {
-        this.gitSnapshotCache.delete(workspaceId);
+        const refreshState = this.getOrCreateGitRefreshState(workspaceId);
+        refreshState.dirtyVersion += 1;
     }
     invalidateTerminalManager(workspaceId) {
         this.terminalManagerCache.delete(workspaceId);
@@ -180,6 +197,18 @@ export class WorkspacePanelSnapshotService {
     invalidateWorkspaceManagement(workspaceId) {
         this.workspaceManagementCache.delete(workspaceId);
     }
+    getOrCreateGitRefreshState(workspaceId) {
+        const existing = this.gitRefreshStates.get(workspaceId);
+        if (existing) {
+            return existing;
+        }
+        const created = {
+            dirtyVersion: 0,
+            lastCompletedDirtyVersion: 0
+        };
+        this.gitRefreshStates.set(workspaceId, created);
+        return created;
+    }
     registerBackgroundTasks() {
         if (!this.taskManager.has(HOST_TASK_TYPES.templateRuntimeStatusDiscovery)) {
             this.taskManager.register({

package/dist/server/modules/workbench/workspace-panel-snapshot-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-panel-snapshot-service.js","sourceRoot":"","sources":["../../../../src/modules/workbench/workspace-panel-snapshot-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace-panel-snapshot-service.js","sourceRoot":"","sources":["../../../../src/modules/workbench/workspace-panel-snapshot-service.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/worktree/worktree-manager.d.ts

@@ -23,7 +23,15 @@ export declare class WorktreeManager {
     private readonly workspaceWorktreeRepository;
     private readonly gitReadService;
     private readonly gitCommandRunner;
-    constructor(workspaceService: WorkspaceService, workspaceWorktreeRepository: WorkspaceWorktreeRepository, gitReadService: GitReadService, gitCommandRunner: GitCommandRunner);
+    private readonly commandTemplateService;
+    constructor(workspaceService: WorkspaceService, workspaceWorktreeRepository: WorkspaceWorktreeRepository, gitReadService: GitReadService, gitCommandRunner: GitCommandRunner, commandTemplateService: {
+        cloneTemplatesToWorkspace(input: {
+            sourceWorkspaceId: string;
+            targetWorkspaceId: string;
+            sourceWorkspacePath: string;
+            targetWorkspacePath: string;
+        }): unknown;
+    });
     create(input: CreateWorktreeInput, signal?: AbortSignal): Promise<WorktreeCreateResult>;
     getTree(rootWorkspaceId: string): WorktreeNodeView[];
     private ensureBranchNameValid;

package/dist/server/modules/worktree/worktree-manager.js

@@ -8,11 +8,13 @@ export class WorktreeManager {
     workspaceWorktreeRepository;
     gitReadService;
     gitCommandRunner;
-    constructor(workspaceService, workspaceWorktreeRepository, gitReadService, gitCommandRunner) {
+    commandTemplateService;
+    constructor(workspaceService, workspaceWorktreeRepository, gitReadService, gitCommandRunner, commandTemplateService) {
         this.workspaceService = workspaceService;
         this.workspaceWorktreeRepository = workspaceWorktreeRepository;
         this.gitReadService = gitReadService;
         this.gitCommandRunner = gitCommandRunner;
+        this.commandTemplateService = commandTemplateService;
     }
     async create(input, signal) {
         const sourceWorkspaceId = input.sourceWorkspaceId.trim();
@@ -63,6 +65,12 @@ export class WorktreeManager {
             });
             worktreeCreated = true;
             createdWorkspace = this.workspaceService.importWorkspace(targetPath, displayName);
+            this.commandTemplateService.cloneTemplatesToWorkspace({
+                sourceWorkspaceId: rootWorkspace.id,
+                targetWorkspaceId: createdWorkspace.id,
+                sourceWorkspacePath: rootWorkspace.path,
+                targetWorkspacePath: createdWorkspace.path
+            });
             const headCommit = await this.resolveHeadCommit(targetPath, createdWorkspace.id, signal);
             const meta = this.workspaceWorktreeRepository.create({
                 workspaceId: createdWorkspace.id,