@tea-agent/loop-agent 0.28.1 → 0.28.2

package/dist/commands/init.js

@@ -6,7 +6,7 @@ import { isDeepStrictEqual } from "node:util";
 import { fileURLToPath } from "node:url";
 import { isInitRuntimeActive, } from "../shared/runtime-activity.js";
 import { loadHarnessManifest } from "../governance/harness.js";
-import { OPENCODE_CONTEXT_OVERFLOW_COMPACT_PLUGIN_PATH, OPENCODE_TRANSIENT_RETRY_PLUGIN_PATH, PI_CONTEXT_OVERFLOW_EXTENSION_PATH, applyPiRetryMerge, buildOpenCodeContextOverflowCompactPluginSource, buildOpenCodeTransientRetryPluginSource, buildPiContextOverflowExtensionSource, inspectPiRetryConfig, parseClientRecoveryMode, runClientRecovery, } from "./client-recovery.js";
+import { OPENCODE_CONTEXT_OVERFLOW_COMPACT_PLUGIN_PATH, OPENCODE_TRANSIENT_RETRY_PLUGIN_PATH, PI_CONTEXT_OVERFLOW_EXTENSION_PATH, PI_PROJECT_SETTINGS_PATH, applyPiRetryMerge, applyProjectPiSettingsMerge, buildOpenCodeContextOverflowCompactPluginSource, buildProjectPiSettingsSource, buildOpenCodeTransientRetryPluginSource, buildPiContextOverflowExtensionSource, inspectProjectPiSettings, parseClientRecoveryMode, runClientRecovery, } from "./client-recovery.js";
 const MANAGED_BLOCK_START = "<!-- LOOP_AGENT_INIT_START -->";
 const MANAGED_BLOCK_END = "<!-- LOOP_AGENT_INIT_END -->";
 const GITIGNORE_BLOCK_START = "# LOOP_AGENT_INIT_START";
@@ -879,6 +879,7 @@ export function buildManagedGitignoreBlock() {
         ".harness/cache/",
         ".harness/*.log",
         ".harness/init-surface.json",
+        ".harness/init-upgrades/",
         "",
         "# Eval Lab runtime (candidates, campaigns, scorecards, dogfood scratch)",
         ".harness/evaluation/",
@@ -1245,6 +1246,7 @@ function inferInitSurfaceMode(relativePath) {
         relativePath === OPENCODE_TRANSIENT_RETRY_PLUGIN_PATH ||
         relativePath === OPENCODE_CONTEXT_OVERFLOW_COMPACT_PLUGIN_PATH ||
         relativePath === PI_CONTEXT_OVERFLOW_EXTENSION_PATH ||
+        relativePath === PI_PROJECT_SETTINGS_PATH ||
         relativePath.startsWith("scripts/") ||
         relativePath.startsWith(".harness/prompts/") ||
         relativePath.startsWith("docs/README.md") ||
@@ -1301,6 +1303,9 @@ async function buildDesiredSurfaceContent(input) {
     if (manifestPath === PI_CONTEXT_OVERFLOW_EXTENSION_PATH) {
         return { content: buildPiContextOverflowExtensionSource() };
     }
+    if (manifestPath === PI_PROJECT_SETTINGS_PATH) {
+        return { content: buildProjectPiSettingsSource() };
+    }
     if (manifestPath.startsWith("scripts/")) {
         const scripts = buildInitScriptFiles(input.governanceRoot);
         return { content: scripts[manifestPath] };
@@ -1488,13 +1493,17 @@ async function writeInitSurfaceState(input) {
         for (const [pathName, file] of Object.entries(state.files)) {
             if (file.relationship !== "local-existing-unknown")
                 continue;
-            const priorHash = input.preserveOwnershipFrom.files[pathName]?.currentSha256;
+            const priorFile = input.preserveOwnershipFrom.files[pathName];
+            const priorHash = priorFile?.currentSha256;
             if (priorHash !== undefined) {
                 file.currentSha256 = priorHash;
             }
             else {
                 delete file.currentSha256;
             }
+            if (priorFile?.acceptedMerge) {
+                file.acceptedMerge = { ...priorFile.acceptedMerge };
+            }
         }
     }
     const target = path.join(input.repoRoot, INIT_SURFACE_STATE_PATH);
@@ -2267,6 +2276,12 @@ export function buildInitInstructions(input) {
         "- Confirm provider/model. Defaults may be used, but the target project may need a different provider/model matrix.",
         "- Default: merge existing AGENTS.md, harness.json, and loop-agent governance docs instead of overwriting user content.",
         "",
+        "## Initialization Upgrade Routing",
+        "",
+        "When the user says `loop-agent初始化更新`, `loop-agent 初始化更新`, `更新 loop-agent 初始化内容`, or an equivalent write request, run `loop-agent init upgrade --repo-root . --json` as the single controller-owned entry. Complete returned single-file allowedPaths merge tasks and call `--continue` until a stable terminal result; do not stop at check-update, needs-safe-update, needs-model-merge, or verification-pending.",
+        "Explicit `检查初始化更新`, `初始化更新校验`, or `只检查，不要修改` stays strictly read-only: run only `loop-agent init check-update --repo-root . --markdown` and do not create an upgrade run.",
+        "Upgrade manages project `.opencode/plugins/`, `.pi/extensions/`, and `.pi/settings.json` by nested merge. Pi must trust the project before loading these settings; do not read or write `~/.pi/agent/settings.json` by default.",
+        "",
         "## Apply Defaults",
         "",
         '- Use the current loop-agent harness.json as the default template, but write target project name plus `adapter: "loop-agent"`.',
@@ -2477,6 +2492,7 @@ export async function initializeLoopAgentProject(options) {
         OPENCODE_TRANSIENT_RETRY_PLUGIN_PATH,
         OPENCODE_CONTEXT_OVERFLOW_COMPACT_PLUGIN_PATH,
         PI_CONTEXT_OVERFLOW_EXTENSION_PATH,
+        PI_PROJECT_SETTINGS_PATH,
     ];
     if (clientRecoveryMode === "off") {
         for (const recoveryPath of clientRecoveryPaths)
@@ -2487,6 +2503,7 @@ export async function initializeLoopAgentProject(options) {
             clientRecovery.plugin,
             clientRecovery.overflowPlugin,
             clientRecovery.piExtension,
+            { written: clientRecovery.pi?.wrote === true },
         ];
         for (const [index, recoveryPath] of clientRecoveryPaths.entries()) {
             if (installResults[index]?.written)
@@ -2540,8 +2557,9 @@ function actionForMissing(pathName, state) {
         reason: "managed block file is missing or stale",
     };
 }
-function modelMergeTaskFor(pathName, state, allPaths) {
+function modelMergeTaskFor(pathName, state, allPaths, recordedState) {
     return {
+        taskId: `init-merge-${sha256Text(pathName).slice(0, 12)}`,
         path: pathName,
         reason: "target file exists but does not match the current loop-agent initialization surface",
         sourcePath: state.sourcePath,
@@ -2562,8 +2580,14 @@ function modelMergeTaskFor(pathName, state, allPaths) {
             "loop-agent init check-update --repo-root . --json",
             "loop-agent init doctor --repo-root .",
             "loop-agent inspect --repo-root .",
+            "loop-agent docs audit --repo-root .",
             "bash scripts/check-repo.sh",
         ],
+        evidence: {
+            baseSha256: recordedState?.files[pathName]?.currentSha256,
+            currentSha256: state.currentSha256,
+            desiredSha256: state.sourceSha256,
+        },
     };
 }
 function recommendedNextFor(report) {
@@ -2588,6 +2612,7 @@ const CLIENT_RECOVERY_SURFACE_PATHS = new Set([
     OPENCODE_TRANSIENT_RETRY_PLUGIN_PATH,
     OPENCODE_CONTEXT_OVERFLOW_COMPACT_PLUGIN_PATH,
     PI_CONTEXT_OVERFLOW_EXTENSION_PATH,
+    PI_PROJECT_SETTINGS_PATH,
 ]);
 function isClientRecoverySurfacePath(pathName) {
     return CLIENT_RECOVERY_SURFACE_PATHS.has(pathName);
@@ -2644,6 +2669,23 @@ export async function checkInitUpdate(input) {
         if (skipClientRecoverySurfaces && isClientRecoverySurfacePath(pathName)) {
             continue;
         }
+        // `.pi/settings.json` is a structured project configuration: fill only
+        // absent nested recovery fields and preserve every explicit project value.
+        if (pathName === PI_PROJECT_SETTINGS_PATH &&
+            state.relationship === "local-existing-unknown") {
+            const projectPi = await inspectProjectPiSettings({ repoRoot });
+            if (projectPi.action === "write") {
+                deterministicActions.push({
+                    type: "merge-pi-project-settings",
+                    path: pathName,
+                    reason: "fill missing project Pi retry/compaction fields without overwriting explicit values",
+                });
+                continue;
+            }
+            if (projectPi.reason === "matches" || projectPi.reason === "enabled-false") {
+                continue;
+            }
+        }
         if (state.relationship === "missing-from-target") {
             if (retiredTargetPaths.has(pathName))
                 continue;
@@ -2661,6 +2703,18 @@ export async function checkInitUpdate(input) {
             continue;
         }
         if (state.relationship === "local-existing-unknown") {
+            const acceptedMerge = recordedState?.files[pathName]?.acceptedMerge;
+            if (acceptedMerge) {
+                if (acceptedMerge.currentSha256 === state.currentSha256 &&
+                    acceptedMerge.desiredSha256 === state.sourceSha256) {
+                    continue;
+                }
+                // A previously accepted semantic merge is user-preserving ownership.
+                // A later desired/current change must be merged again, never refreshed
+                // as an unchanged package-owned file.
+                modelMergeTasks.push(modelMergeTaskFor(pathName, state, allPaths, recordedState));
+                continue;
+            }
             if (state.mode === "directory") {
                 humanDecisions.push({
                     path: pathName,
@@ -2679,7 +2733,7 @@ export async function checkInitUpdate(input) {
                 });
             }
             else {
-                modelMergeTasks.push(modelMergeTaskFor(pathName, state, allPaths));
+                modelMergeTasks.push(modelMergeTaskFor(pathName, state, allPaths, recordedState));
             }
         }
     }
@@ -2736,10 +2790,8 @@ export async function checkInitUpdate(input) {
         },
     };
     const recommendedNext = recommendedNextFor(partial);
-    // Pi user config is never part of project surface hash; only report semantics.
-    const piInspection = await inspectPiRetryConfig({
-        homeDir: input.homeDir,
-    });
+    // Project settings are part of the surface. Do not inspect user home by default.
+    const piInspection = await inspectProjectPiSettings({ repoRoot });
     return {
         ...partial,
         ok: deterministicActions.length === 0 &&
@@ -2752,6 +2804,9 @@ export async function checkInitUpdate(input) {
     };
 }
 async function applySafeAction(input) {
+    if (input.action.type === "merge-pi-project-settings") {
+        return (await applyProjectPiSettingsMerge({ repoRoot: input.repoRoot })).wrote === true;
+    }
     if (input.action.type === "add-harness-schema-ref") {
         const target = path.join(input.repoRoot, "harness.json");
         if (!(await exists(target)))
@@ -3141,13 +3196,19 @@ function parseInitArgs(repoRoot, args) {
     let markdown = false;
     let bootstrapSurface = false;
     let applySafe = false;
+    let runId;
+    let upgradeStatus = false;
+    let upgradeContinue = false;
+    let upgradeReport = false;
+    let versionChoice;
     for (let i = 0; i < args.length; i += 1) {
         const arg = args[i];
         if ((arg === "instructions" ||
             arg === "doctor" ||
             arg === "check-update" ||
             arg === "update" ||
-            arg === "reconcile") &&
+            arg === "reconcile" ||
+            arg === "upgrade") &&
             !subcommand) {
             subcommand = arg;
             continue;
@@ -3188,6 +3249,20 @@ function parseInitArgs(repoRoot, args) {
             bootstrapSurface = true;
         else if (arg === "--apply-safe")
             applySafe = true;
+        else if (arg === "--run-id")
+            runId = args[++i];
+        else if (arg.startsWith("--run-id="))
+            runId = arg.slice("--run-id=".length);
+        else if (arg === "--status")
+            upgradeStatus = true;
+        else if (arg === "--continue")
+            upgradeContinue = true;
+        else if (arg === "--report")
+            upgradeReport = true;
+        else if (arg === "--version-choice")
+            versionChoice = args[++i];
+        else if (arg.startsWith("--version-choice="))
+            versionChoice = arg.slice("--version-choice=".length);
         else if (arg.startsWith("-"))
             throw new Error(`unknown init flag: ${arg}`);
         else
@@ -3195,6 +3270,9 @@ function parseInitArgs(repoRoot, args) {
     }
     if (profile !== "full" && profile !== "minimal")
         throw new Error("init --profile must be full or minimal");
+    if (versionChoice && !["current", "upgrade", "cancel", "retry"].includes(versionChoice)) {
+        throw new Error("init upgrade --version-choice must be current|upgrade|cancel|retry");
+    }
     return {
         repoRoot,
         projectName,
@@ -3209,6 +3287,11 @@ function parseInitArgs(repoRoot, args) {
         markdown,
         bootstrapSurface,
         applySafe,
+        runId,
+        upgradeStatus,
+        upgradeContinue,
+        upgradeReport,
+        versionChoice,
     };
 }
 export async function runInit(repoRoot, rawArgs, dependencies) {
@@ -3244,6 +3327,24 @@ export async function runInit(repoRoot, rawArgs, dependencies) {
             : formatInitUpdateResult(result));
         return;
     }
+    if (parsed.subcommand === "upgrade") {
+        const { runInitUpgrade } = await import("./init-upgrade.js");
+        const selected = [parsed.upgradeStatus, parsed.upgradeContinue, parsed.upgradeReport].filter(Boolean).length;
+        if (selected > 1)
+            throw new Error("init upgrade accepts only one of --status, --continue, or --report");
+        const result = await runInitUpgrade({
+            repoRoot: parsed.repoRoot,
+            runId: parsed.runId,
+            mode: parsed.upgradeStatus ? "status" : parsed.upgradeContinue ? "continue" : parsed.upgradeReport ? "report" : "start",
+            versionChoice: parsed.versionChoice,
+            readRuntimeActivity: dependencies.readRuntimeActivity,
+        });
+        if ("markdown" in result)
+            console.log(result.markdown);
+        else
+            console.log(parsed.json ? JSON.stringify(result, null, 2) : formatInitUpgradeResult(result));
+        return;
+    }
     if (parsed.subcommand === "reconcile") {
         const result = await runInitReconcile({
             ...parsed,
@@ -3257,6 +3358,16 @@ export async function runInit(repoRoot, rawArgs, dependencies) {
     const result = await initializeLoopAgentProject(parsed);
     console.log(parsed.json ? JSON.stringify(result, null, 2) : formatInitResult(result));
 }
+function formatInitUpgradeResult(result) {
+    return [
+        `loop-agent init upgrade: ${result.status}`,
+        `runId: ${result.runId}`,
+        `phase: ${result.phase}`,
+        `modelMergeTasks: ${result.modelMergeTasks.length}`,
+        `humanDecisions: ${result.humanDecisions.length}`,
+        `next: ${result.nextAction}`,
+    ].join("\n");
+}
 function formatInitUpdateResult(result) {
     return [
         "loop-agent init update complete",

package/dist/governance/manifest-types.js

@@ -126,6 +126,69 @@ export const workflowPolicySchema = z
 })
     .optional()
     .default({});
+/** Night Scheduler tracked policy (ADR 0009). Defaults are package-safe; company repos may require task cards. */
+export const nightSchedulerMisfirePolicySchema = z.enum([
+    "run-immediately",
+    "wait-next-window",
+    "human-required",
+]);
+export const nightSchedulerMergePolicySchema = z.enum([
+    "manual-on-success",
+    "auto-on-success",
+]);
+export const nightSchedulerTraceabilitySchema = z
+    .object({
+    required: z.boolean().optional().default(false),
+    label: z.string().min(1).optional().default("Task Card"),
+    pattern: z
+        .string()
+        .min(1)
+        .optional()
+        .default("^[A-Z][A-Z0-9]+-[A-Z0-9]+#[0-9]+$"),
+    commitMessageTemplate: z
+        .string()
+        .min(1)
+        .optional()
+        .default("{summary}\n\n{workItemRef}"),
+})
+    .superRefine((value, ctx) => {
+    if (!value.commitMessageTemplate.includes("{workItemRef}")) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: "workerPolicy.nightScheduler.traceability.commitMessageTemplate must include {workItemRef}",
+            path: ["commitMessageTemplate"],
+        });
+    }
+});
+export const nightSchedulerAutoFollowUpSchema = z.object({
+    /** Default off (ADR 0010). When true, failed night executions may draft Follow-up only. */
+    enabled: z.boolean().optional().default(false),
+    /** MVP only supports draft-only (never auto-approve / never auto-Ready). */
+    mode: z.enum(["draft-only"]).optional().default("draft-only"),
+});
+export const nightSchedulerPolicySchema = z.object({
+    enabled: z.boolean().optional().default(false),
+    timezone: z.string().min(1).optional().default("Asia/Shanghai"),
+    allowedHours: z
+        .array(z.string().regex(/^\d{2}:\d{2}-\d{2}:\d{2}$/))
+        .optional()
+        .default(["00:00-08:00"]),
+    maxConcurrency: z.number().int().positive().optional().default(1),
+    maxAutoAttempts: z.number().int().positive().optional().default(1),
+    misfirePolicy: nightSchedulerMisfirePolicySchema
+        .optional()
+        .default("wait-next-window"),
+    keepFailedWorktree: z.boolean().optional().default(true),
+    mergePolicy: nightSchedulerMergePolicySchema
+        .optional()
+        .default("manual-on-success"),
+    traceability: nightSchedulerTraceabilitySchema.optional().default({}),
+    /** ADR 0010 — default off; omit or enabled:false keeps night silent on follow-ups. */
+    autoFollowUp: nightSchedulerAutoFollowUpSchema.optional(),
+});
+export const workerPolicySchema = z.object({
+    nightScheduler: nightSchedulerPolicySchema.optional().default({}),
+});
 export const CURSOR_HARNESS_EXECUTOR_REMOVED_ERROR = "harness executors.cursor is no longer supported; remove it and use executors.pi only (Cursor is available only via cursor-prompt sidecar)";
 export const harnessManifestSchema = z
     .object({
@@ -169,6 +232,8 @@ export const harnessManifestSchema = z
         .optional()
         .default({}),
     workflowPolicy: workflowPolicySchema,
+    /** Optional; absent means Night Scheduler uses package defaults when enabled by callers. */
+    workerPolicy: workerPolicySchema.optional(),
     worktree: worktreeManifestConfigSchema.optional(),
     executors: z
         .record(z.string(), executorManifestSchema)