@evandu/super-pi 0.1.145 → 0.1.147

package/dist/server/file-name-index.js

@@ -32,7 +32,9 @@
  * replaces.
  */
 import { readdir } from "node:fs/promises";
+import { isAbsolute, relative, resolve, sep } from "node:path";
 import { createRootGuard, toRelative } from "./files.js";
+import { sessionScopeKey } from "./session-cwd.js";
 /**
  * THE INDEX FOR ONE WORKSPACE, created on demand and then kept.
  *
@@ -40,15 +42,28 @@ import { createRootGuard, toRelative } from "./files.js";
  * the agent's writes - go through this one function, so there is exactly one index per workspace and
  * the two never drift into answering from different maps.
  */
-export function ensureNameIndex(indexes, workspaceId, root) {
-    let index = indexes.get(workspaceId);
+export function ensureNameIndex(indexes, workspaceId, root, cwd = "") {
+    const key = sessionScopeKey(workspaceId, cwd);
+    let index = indexes.get(key);
     if (!index) {
-        index = new FileNameIndex(workspaceId);
-        indexes.set(workspaceId, index);
+        index = new FileNameIndex(workspaceId, cwd);
+        indexes.set(key, index);
     }
     index.start(root);
     return index;
 }
+/** Keeps every root/subdirectory index for a workspace in step with one observed write. */
+export function recordWorkspacePath(indexes, workspaceId, workspaceRoot, path) {
+    const absolute = resolve(workspaceRoot, path);
+    for (const index of indexes.values()) {
+        if (index.workspaceId !== workspaceId)
+            continue;
+        const scoped = relative(resolve(workspaceRoot, index.cwd), absolute);
+        if (!scoped || scoped === ".." || scoped.startsWith(`..${sep}`) || isAbsolute(scoped))
+            continue;
+        index.upsert(scoped.split(sep).join("/"));
+    }
+}
 const MAX_DIRECTORIES = 20000;
 const MAX_FILES = 200000;
 /**
@@ -92,6 +107,7 @@ function hitPosition(entry, needle) {
  */
 export class FileNameIndex {
     workspaceId;
+    cwd;
     entries = new Map();
     root = "";
     building = false;
@@ -99,8 +115,9 @@ export class FileNameIndex {
     scanned = 0;
     stopped = false;
     incomplete = false;
-    constructor(workspaceId) {
+    constructor(workspaceId, cwd = "") {
         this.workspaceId = workspaceId;
+        this.cwd = cwd;
     }
     /**
      * Whether the first pass has FINISHED.

package/dist/server/git.d.ts

@@ -13,8 +13,8 @@ export type GitFile = {
     name: string;
     xy: string;
 };
-export declare function gitStatus(root: string): Promise<GitWorkspace>;
-export declare function gitLog(root: string, limit: number): Promise<{
+export declare function gitStatus(root: string, cwd?: string): Promise<GitWorkspace>;
+export declare function gitLog(root: string, limit: number, cwd?: string): Promise<{
     commits: {
         hash: string;
         short: string;
@@ -138,4 +138,4 @@ export type GitBlameOptions = {
 export declare function gitBlame(root: string, path: string, options?: GitBlameOptions): Promise<GitBlameResponse>;
 /** Whether the directory is a git repository at all. The review view asks before it offers a git baseline. */
 export declare function isGitRepository(root: string): Promise<boolean>;
-export declare function gitMutate(root: string, op: string, path?: string, message?: string): Promise<GitWorkspace>;
+export declare function gitMutate(root: string, op: string, path?: string, message?: string, cwd?: string): Promise<GitWorkspace>;

package/dist/server/git.js

@@ -5,8 +5,9 @@ import { existsSync } from "node:fs";
 import { readFile, stat } from "node:fs/promises";
 const exec = promisify(execFile);
 async function git(cwd, args, options) { return exec("git", ["-c", "core.quotepath=false", ...args], { cwd, windowsHide: true, maxBuffer: options?.maxBuffer ?? 8 * 1024 * 1024 }); }
-function files(raw) { const staged = [], unstaged = [], untracked = []; for (const line of raw.split("\0").filter(Boolean)) {
-    const xy = line.slice(0, 2), path = line.slice(3).split("\0")[0].replaceAll("\\", "/");
+function files(raw, cwd = "") { const staged = [], unstaged = [], untracked = []; for (const line of raw.split("\0").filter(Boolean)) {
+    const xy = line.slice(0, 2), repoPath = line.slice(3).split("\0")[0].replaceAll("\\", "/");
+    const path = cwd && repoPath.startsWith(`${cwd}/`) ? repoPath.slice(cwd.length + 1) : repoPath;
     const item = { path, name: basename(path), xy };
     if (xy === "??")
         untracked.push(item);
@@ -17,14 +18,14 @@ function files(raw) { const staged = [], unstaged = [], untracked = []; for (con
             unstaged.push(item);
     }
 } return { staged, unstaged, untracked }; }
-export async function gitStatus(root) { try {
+export async function gitStatus(root, cwd = "") { try {
     await git(root, ["rev-parse", "--git-dir"]);
 }
 catch {
     throw Object.assign(new Error("此工作区不是 Git 仓库"), { code: "not_a_repo" });
-} const status = await git(root, ["status", "--porcelain=v1", "-z"]); const branch = await git(root, ["symbolic-ref", "--short", "-q", "HEAD"]).then(r => r.stdout.trim() || null).catch(() => null); const unborn = !(await git(root, ["rev-parse", "--verify", "HEAD"]).then(() => true).catch(() => false)); const ahead = await git(root, ["rev-list", "--left-right", "--count", "HEAD...@{upstream}"]).then(r => { const [a, b] = r.stdout.trim().split(/\s+/).map(Number); return Number.isFinite(a) ? a : null; }).catch(() => null); const behind = await git(root, ["rev-list", "--left-right", "--count", "HEAD...@{upstream}"]).then(r => { const [a, b] = r.stdout.trim().split(/\s+/).map(Number); return Number.isFinite(b) ? b : null; }).catch(() => null); return { branch, detached: !branch, unborn, ahead, behind, ...files(status.stdout) }; }
-export async function gitLog(root, limit) { const hasHead = await git(root, ["rev-parse", "--verify", "HEAD"]).then(() => true).catch(() => false); if (!hasHead)
-    return { commits: [], truncated: false }; const out = await git(root, ["log", `-${Math.min(Math.max(limit, 1), 50)}`, "--format=%H%x00%h%x00%s%x00%an%x00%aI%x00"]); const parts = out.stdout.split("\0").filter(Boolean); const commits = []; for (let i = 0; i + 4 < parts.length; i += 5)
+} const status = await git(root, ["status", "--porcelain=v1", "-z", ...(cwd ? ["--", cwd] : [])]); const branch = await git(root, ["symbolic-ref", "--short", "-q", "HEAD"]).then(r => r.stdout.trim() || null).catch(() => null); const unborn = !(await git(root, ["rev-parse", "--verify", "HEAD"]).then(() => true).catch(() => false)); const ahead = await git(root, ["rev-list", "--left-right", "--count", "HEAD...@{upstream}"]).then(r => { const [a, b] = r.stdout.trim().split(/\s+/).map(Number); return Number.isFinite(a) ? a : null; }).catch(() => null); const behind = await git(root, ["rev-list", "--left-right", "--count", "HEAD...@{upstream}"]).then(r => { const [a, b] = r.stdout.trim().split(/\s+/).map(Number); return Number.isFinite(b) ? b : null; }).catch(() => null); return { branch, detached: !branch, unborn, ahead, behind, ...files(status.stdout, cwd) }; }
+export async function gitLog(root, limit, cwd = "") { const hasHead = await git(root, ["rev-parse", "--verify", "HEAD"]).then(() => true).catch(() => false); if (!hasHead)
+    return { commits: [], truncated: false }; const out = await git(root, ["log", `-${Math.min(Math.max(limit, 1), 50)}`, "--format=%H%x00%h%x00%s%x00%an%x00%aI%x00", ...(cwd ? ["--", cwd] : [])]); const parts = out.stdout.split("\0").filter(Boolean); const commits = []; for (let i = 0; i + 4 < parts.length; i += 5)
     commits.push({ hash: parts[i], short: parts[i + 1], subject: parts[i + 2], author: parts[i + 3], date: new Date(parts[i + 4]).toISOString() }); return { commits, truncated: commits.length >= limit }; }
 export async function gitDiff(root, path, staged) { const safe = resolve(root, path); if (!safe.startsWith(resolve(root) + sep) || !existsSync(safe))
     throw Object.assign(new Error("文件路径无效"), { code: "path" }); const check = await git(root, ["ls-files", "--error-unmatch", "--", path]).then(() => true).catch(() => false); if (!check)
@@ -341,7 +342,7 @@ function safePath(root, path) {
         throw Object.assign(new Error("文件路径无效"), { code: "path" });
     return path;
 }
-export async function gitMutate(root, op, path, message) {
+export async function gitMutate(root, op, path, message, cwd = "") {
     if (op === "stage" || op === "unstage" || op === "discard") {
         if (!path)
             throw Object.assign(new Error("缺少文件路径"), { code: "path" });
@@ -356,7 +357,7 @@ export async function gitMutate(root, op, path, message) {
     else if (op === "commit") {
         if (!message?.trim())
             throw Object.assign(new Error("提交消息不能为空"), { code: "bad_message" });
-        await git(root, ["commit", "-m", message.trim()]);
+        await git(root, ["commit", "-m", message.trim(), ...(cwd ? ["--", cwd] : [])]);
     }
     else if (op === "pull")
         await git(root, ["pull", "--ff-only"]);
@@ -364,5 +365,5 @@ export async function gitMutate(root, op, path, message) {
         await git(root, ["push"]);
     else
         throw Object.assign(new Error("未知 Git 操作"), { code: "bad_op" });
-    return gitStatus(root);
+    return gitStatus(root, cwd);
 }