@auto-ai/agent 2.1.219 → 2.1.221

package/tools-runtime/git-tool/index.cjs

@@ -14387,6 +14387,19 @@ var GIT_NO_PROMPT_ENV = {
   GIT_TERMINAL_PROMPT: "0",
   GIT_ASKPASS: ""
 };
+var agentGitPreparedDirs = new Set;
+function normalizeOperWorkspaceKey(operWorkspaceDir) {
+  return operWorkspaceDir.normalize("NFC");
+}
+function logGitBootPhase(phase, startedAt, extra) {
+  const parts = [`[session-boot] git.${phase}`, `duration_ms=${Date.now() - startedAt}`];
+  if (extra) {
+    for (const [k, v] of Object.entries(extra)) {
+      parts.push(`${k}=${v}`);
+    }
+  }
+  console.warn(parts.join(" "));
+}
 function getGitTimeoutMs() {
   const envValue = process.env.CLAUDE_CODE_PLUGIN_GIT_TIMEOUT_MS;
   if (envValue) {
@@ -14587,41 +14600,43 @@ async function wsGitClone(params) {
 ${stderr}`.trim());
   }
 }
-async function wsGitPull(params) {
-  console.warn(`[git-tool] pull cwd=${params.cwd}`);
-  const result = await execGit(["pull", "origin", "HEAD"], {
-    cwd: params.cwd,
-    env: params.gitEnv
-  });
-  if (result.code !== 0) {
-    throw new Error(`git pull 失败: cwd=${params.cwd} exit=${result.code}
-${result.stderr}`.trim());
-  }
-}
 async function prepareForAgent(params) {
+  const bootStart = Date.now();
+  const workspaceKey = normalizeOperWorkspaceKey(params.operWorkspaceDir);
   const repoUrl = process.env.WS_GIT_REPO_URL?.trim() ?? "";
   const creds = readGitCredentials();
   const gitWorkDir = resolveGitWorkDir(params.operWorkspaceDir);
   const gitEnv = buildGitCredentialEnv(creds);
+  if (agentGitPreparedDirs.has(workspaceKey)) {
+    configure({
+      getGitWorkDir: () => gitWorkDir,
+      getGitCommandEnv: () => gitEnv
+    });
+    logGitBootPhase("skip", bootStart, { reason: "already_prepared" });
+    return "ready";
+  }
   if (repoUrl) {
     const cloneUrl = withHttpsCredentials(repoUrl, creds);
-    await probeGitRemote({ url: cloneUrl, gitEnv });
     const repoExists = await pathExists(gitWorkDir);
     if (!repoExists) {
+      const probeStart = Date.now();
+      await probeGitRemote({ url: cloneUrl, gitEnv });
+      logGitBootPhase("probe", probeStart);
+      const cloneStart = Date.now();
       await import_promises.mkdir(import_node_path.dirname(gitWorkDir), { recursive: true });
       await wsGitClone({
         url: cloneUrl,
         targetPath: gitWorkDir,
         gitEnv
       });
-    } else {
-      await wsGitPull({ cwd: gitWorkDir, gitEnv });
+      logGitBootPhase("clone", cloneStart);
     }
   } else {
     const repoReady = await pathExists(gitWorkDir) && await isGitWorkTree(gitWorkDir, gitEnv);
     if (!repoReady) {
       console.warn(`[git-tool] WS_GIT_REPO_URL 未配置且 ${gitWorkDir} 不是有效 git 工作区，跳过 GitTool 运行时配置`);
       resetConfigure();
+      logGitBootPhase("skip", bootStart, { reason: "no_repo" });
       return "skipped";
     }
   }
@@ -14629,6 +14644,8 @@ async function prepareForAgent(params) {
     getGitWorkDir: () => gitWorkDir,
     getGitCommandEnv: () => gitEnv
   });
+  agentGitPreparedDirs.add(workspaceKey);
+  logGitBootPhase("ready", bootStart);
   return "ready";
 }
 function ensureConfigured() {
@@ -14644,23 +14661,7 @@ async function initWsSession(ctx) {
     resetConfigure();
     return { state: "skipped", reason: "GitTool disabled in agent config" };
   }
-  try {
-    const result = await prepareForAgent({ operWorkspaceDir: ctx.operWorkspaceDir });
-    if (result === "skipped") {
-      resetConfigure();
-      return {
-        state: "skipped",
-        reason: "git work directory not ready (configure WS_GIT_REPO_URL or existing repo)"
-      };
-    }
-    return { state: "ready" };
-  } catch (e) {
-    resetConfigure();
-    return {
-      state: "failed",
-      error: e instanceof Error ? e.message : String(e)
-    };
-  }
+  return { state: "ready" };
 }
 
 // src/index.ts

package/tools-runtime/git-tool/src/workspace.ts

@@ -30,6 +30,27 @@ export type GitCredentials = {
 
 export type PrepareForAgentResult = 'ready' | 'skipped'
 
+/** 本进程内已完成 git 工作区准备的 operWorkspaceDir，避免 reload/boot 重复 pull */
+const agentGitPreparedDirs = new Set<string>()
+
+function normalizeOperWorkspaceKey(operWorkspaceDir: string): string {
+  return operWorkspaceDir.normalize('NFC')
+}
+
+function logGitBootPhase(
+  phase: string,
+  startedAt: number,
+  extra?: Record<string, string | number | boolean>,
+): void {
+  const parts = [`[session-boot] git.${phase}`, `duration_ms=${Date.now() - startedAt}`]
+  if (extra) {
+    for (const [k, v] of Object.entries(extra)) {
+      parts.push(`${k}=${v}`)
+    }
+  }
+  console.warn(parts.join(' '))
+}
+
 function getGitTimeoutMs(): number {
   const envValue = process.env.CLAUDE_CODE_PLUGIN_GIT_TIMEOUT_MS
   if (envValue) {
@@ -360,30 +381,43 @@ async function wsGitPull(params: {
 
 /**
  * WS init：按环境变量准备 git 工作区并 configure GitTool。
- * 未配置 WS_GIT_REPO_URL 且本地无 git 工作区时返回 skipped，不抛错。
+ * 有 WS_GIT_REPO_URL 时仅缺目录才 clone；本地已有 repo 不再 pull（磁盘即真相）。
+ * 未配置 URL 且本地无 git 工作区时返回 skipped，不抛错。
  */
 export async function prepareForAgent(params: {
   operWorkspaceDir: string
 }): Promise<PrepareForAgentResult> {
+  const bootStart = Date.now()
+  const workspaceKey = normalizeOperWorkspaceKey(params.operWorkspaceDir)
   const repoUrl = process.env.WS_GIT_REPO_URL?.trim() ?? ''
   const creds = readGitCredentials()
   const gitWorkDir = resolveGitWorkDir(params.operWorkspaceDir)
   const gitEnv = buildGitCredentialEnv(creds)
 
+  if (agentGitPreparedDirs.has(workspaceKey)) {
+    configure({
+      getGitWorkDir: () => gitWorkDir,
+      getGitCommandEnv: () => gitEnv,
+    })
+    logGitBootPhase('skip', bootStart, { reason: 'already_prepared' })
+    return 'ready'
+  }
+
   if (repoUrl) {
     const cloneUrl = withHttpsCredentials(repoUrl, creds)
-    await probeGitRemote({ url: cloneUrl, gitEnv })
     const repoExists = await pathExists(gitWorkDir)
     if (!repoExists) {
-      // clone 前创建 workspace/ 等父目录，避免 git clone 因路径不存在失败
+      const probeStart = Date.now()
+      await probeGitRemote({ url: cloneUrl, gitEnv })
+      logGitBootPhase('probe', probeStart)
+      const cloneStart = Date.now()
       await mkdir(dirname(gitWorkDir), { recursive: true })
       await wsGitClone({
         url: cloneUrl,
         targetPath: gitWorkDir,
         gitEnv,
       })
-    } else {
-      await wsGitPull({ cwd: gitWorkDir, gitEnv })
+      logGitBootPhase('clone', cloneStart)
     }
   } else {
     const repoReady =
@@ -394,6 +428,7 @@ export async function prepareForAgent(params: {
         `[git-tool] WS_GIT_REPO_URL 未配置且 ${gitWorkDir} 不是有效 git 工作区，跳过 GitTool 运行时配置`,
       )
       resetConfigure()
+      logGitBootPhase('skip', bootStart, { reason: 'no_repo' })
       return 'skipped'
     }
   }
@@ -402,6 +437,8 @@ export async function prepareForAgent(params: {
     getGitWorkDir: () => gitWorkDir,
     getGitCommandEnv: () => gitEnv,
   })
+  agentGitPreparedDirs.add(workspaceKey)
+  logGitBootPhase('ready', bootStart)
   return 'ready'
 }
 

package/tools-runtime/git-tool/src/wsInit.ts

@@ -20,8 +20,8 @@ export type GitToolWsInitResult =
   | { state: 'skipped'; reason?: string }
   | { state: 'failed'; error: string }
 
-/** WS init：按 agent 白名单与环境变量准备 git 工作区 */
-export async function initWsSession(
+/** Agent Worker 级：clone/pull 等重操作只执行一次 */
+export async function initWsAgent(
   ctx: GitToolWsInitContext,
 ): Promise<GitToolWsInitResult> {
   if (!isEnabledInAgentConfig(ctx.agent)) {
@@ -46,3 +46,14 @@ export async function initWsSession(
     }
   }
 }
+
+/** Session 级：git 工作区已在 agent boot 准备，仅确认白名单 */
+export async function initWsSession(
+  ctx: GitToolWsInitContext,
+): Promise<GitToolWsInitResult> {
+  if (!isEnabledInAgentConfig(ctx.agent)) {
+    resetConfigure()
+    return { state: 'skipped', reason: 'GitTool disabled in agent config' }
+  }
+  return { state: 'ready' }
+}