@tea-agent/loop-agent 0.28.2 → 0.28.3

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 
+## [0.28.3] - 2026-08-05
+
+### 重点更新
+
+- 修复 Night Scheduler 准入控制因运行态文件自污染导致 clean-tree 校验总是误拒的问题
+
+### 修复
+
+- Night Scheduler 准入控制：freezeCleanBase 忽略 .harness/** 与 .worktrees/** 运行态事实，避免 lifecycle 运行事实自污染导致 clean-tree 误拒，同时保留失败 admission 的 submitted → rejected 审计链
+- 调整 freezeCleanBase 的执行顺序，将其提前至 submitSchedule 之前，确保 baseCommit 能在调度器写入控制文件前正确捕获 HEAD
+- freezeCleanBase 将 .harness 与 .worktrees 视为非源码脏污（与 harvest 逻辑共享），避免准入流程自写入的调度事实干扰基线冻结
+
 ## [0.28.2] - 2026-08-05
 
 ### 重点更新

package/dist/worker/scheduler/admission.js

@@ -64,6 +64,10 @@ export async function prepareAdmission(input) {
         path.basename(featureDir) !== taskSpec.feature_id) {
         // Soft check: feature dir basename should match feature_id when conventional.
     }
+    // Freeze base before writing schedule facts. Runtime under .harness/.worktrees
+    // is ignored by freezeCleanBase, but freezing early still captures the intended HEAD.
+    const baseFactory = input.baseFactory ?? freezeCleanBase;
+    const base = await baseFactory(controlRepoRoot);
     const submitted = await submitSchedule({
         controlRepoRoot,
         featureId: taskSpec.feature_id,
@@ -108,8 +112,6 @@ export async function prepareAdmission(input) {
             toStatus: "validating",
             now,
         });
-        const baseFactory = input.baseFactory ?? freezeCleanBase;
-        const base = await baseFactory(controlRepoRoot);
         const workspaceFactory = input.workspaceFactory ?? prepareNightWorkspace;
         const workspace = await workspaceFactory({
             controlRepoRoot,

package/dist/worker/scheduler/git-base.js

@@ -1,7 +1,39 @@
 import { spawn } from "node:child_process";
+/**
+ * Scheduler/Task Pool runtime under `.harness` and night worktrees are expected
+ * control facts. They must not block admission/harvest of source commits.
+ */
+export function isSchedulerRuntimeGitPath(filePath) {
+    const normalized = filePath.replace(/\\/g, "/").replace(/^\.\//, "");
+    return (normalized === ".harness" ||
+        normalized === ".worktrees" ||
+        normalized.startsWith(".harness/") ||
+        normalized.startsWith(".worktrees/"));
+}
+/**
+ * Parse `git status --porcelain=v1` and return source-path dirty lines only.
+ * XY markers occupy the first two columns; path starts at index 3.
+ */
+export function filterSourceDirtyPorcelain(statusPorcelain) {
+    return statusPorcelain
+        .split("\n")
+        .map((line) => line.trimEnd())
+        .filter(Boolean)
+        .filter((line) => {
+        // Rename lines: `R  old -> new` — treat either side as dirty source.
+        const body = line.slice(3).trim();
+        if (body.includes(" -> ")) {
+            const [from, to] = body.split(" -> ").map((part) => part.trim());
+            return ((from ? !isSchedulerRuntimeGitPath(from) : false) ||
+                (to ? !isSchedulerRuntimeGitPath(to) : false));
+        }
+        return !isSchedulerRuntimeGitPath(body);
+    });
+}
 /**
  * Freeze the control repo HEAD as admission base.
- * MVP requires a named branch and clean working tree.
+ * MVP requires a named branch and a clean *source* working tree.
+ * Runtime facts under `.harness/**` / `.worktrees/**` are ignored (ADR 0009).
  */
 export async function freezeCleanBase(controlRepoRoot) {
     const branch = (await runGit(controlRepoRoot, ["rev-parse", "--abbrev-ref", "HEAD"])).trim();
@@ -11,13 +43,18 @@ export async function freezeCleanBase(controlRepoRoot) {
         "status",
         "--porcelain=v1",
         "--untracked-files=all",
-    ])).trim();
-    const isClean = statusPorcelain.length === 0;
+    ])).trimEnd();
+    const dirtySourceLines = filterSourceDirtyPorcelain(statusPorcelain);
+    const isClean = dirtySourceLines.length === 0;
     if (isDetached) {
         throw new Error("admission requires a named base branch (detached HEAD is not allowed)");
     }
     if (!isClean) {
-        throw new Error("admission requires a clean Git working tree on the base branch");
+        const sample = dirtySourceLines
+            .slice(0, 5)
+            .map((line) => line.slice(3).trim())
+            .join(", ");
+        throw new Error(`admission requires a clean Git working tree on the base branch${sample ? ` (dirty source: ${sample})` : ""}`);
     }
     return {
         baseBranch: branch,
@@ -25,6 +62,7 @@ export async function freezeCleanBase(controlRepoRoot) {
         isClean,
         isDetached,
         statusPorcelain,
+        dirtySourceLines,
     };
 }
 export async function runGit(cwd, args) {

package/dist/worker/scheduler/night-harvest.js

@@ -1,6 +1,7 @@
 import { rm } from "node:fs/promises";
 import path from "node:path";
 import { spawn } from "node:child_process";
+import { filterSourceDirtyPorcelain } from "./git-base.js";
 import { getLeasePath } from "./paths.js";
 import { verifyEvidenceArchive } from "./evidence.js";
 import { patchScheduleIsolation, transitionSchedule, } from "./lifecycle.js";
@@ -50,20 +51,10 @@ export async function harvestNightSchedule(input) {
         "status",
         "--porcelain=v1",
         "--untracked-files=all",
-    ])).trim();
+    ])).trimEnd();
     // Scheduler/Task Pool runtime under .harness and night worktrees are expected
     // control facts; they must not block harvest of source commits.
-    const dirtySource = baseStatus
-        .split("\n")
-        .map((line) => line.trim())
-        .filter(Boolean)
-        .filter((line) => {
-        const filePath = line.slice(3).trim().replace(/\\/g, "/");
-        return (!filePath.startsWith(".harness/") &&
-            !filePath.startsWith(".worktrees/") &&
-            filePath !== ".harness" &&
-            filePath !== ".worktrees");
-    });
+    const dirtySource = filterSourceDirtyPorcelain(baseStatus);
     if (dirtySource.length > 0) {
         return blocked("base-dirty", `control repo has uncommitted source changes: ${dirtySource
             .slice(0, 5)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tea-agent/loop-agent",
-  "version": "0.28.2",
+  "version": "0.28.3",
   "type": "module",
   "bin": {
     "loop-agent": "bin/loop-agent.js",