@tea-agent/loop-agent 0.35.1-beta.0 → 0.35.1-beta.2

package/dist/worker/console/static-src/operator-chat/useComposer.js

@@ -1,7 +1,6 @@
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, } from "react";
 import { filterSlashCommands, mergeSlashCommands, } from "../../chat/shortcuts.js";
 import { confirmationToken } from "./format.js";
-import { clampShortcutIndex } from "./slash-palette-nav.js";
 import { attachRuntimeSnapshotController } from "./useRuntimeSnapshot.js";
 /** Composer state: input text, @file palette, image attachments, /shortcuts,
  *  IME composition guards, auto-grow and server-side draft sync. */
@@ -17,22 +16,12 @@ export function useComposer(params) {
     const [dynamicCommandsError, setDynamicCommandsError] = useState(null);
     const [commandsEpoch, setCommandsEpoch] = useState(0);
     const textareaRef = useRef(null);
-    /** Active session generation for /commands; bumped immediately on switch (AC-2). */
-    const commandsSessionRef = useRef(sessionId);
-    const commandsGenerationRef = useRef(0);
+    const commandsSessionRef = useRef(undefined);
     const handleInputChange = useCallback((value) => {
         setInput(value);
         setShortcutOpen(value.startsWith("/"));
         setShortcutIndex(0);
     }, []);
-    // Immediate invalidation on A→B even when B palette never opens (AC-2).
-    useLayoutEffect(() => {
-        commandsSessionRef.current = sessionId;
-        commandsGenerationRef.current += 1;
-        setDynamicCommands([]);
-        setDynamicCommandsError(null);
-        setDynamicCommandsLoading(false);
-    }, [sessionId]);
     const loadDynamicCommands = useCallback(async () => {
         if (!sessionId) {
             setDynamicCommands([]);
@@ -41,15 +30,12 @@ export function useComposer(params) {
             return;
         }
         const target = sessionId;
-        const generation = commandsGenerationRef.current;
         commandsSessionRef.current = target;
         setDynamicCommandsLoading(true);
         setDynamicCommandsError(null);
-        const isCurrent = () => commandsSessionRef.current === target &&
-            commandsGenerationRef.current === generation;
         try {
             const res = await fetch(`${origin}/api/operator/v1/chat/sessions/${encodeURIComponent(target)}/commands`, { credentials: "include" });
-            if (!isCurrent())
+            if (commandsSessionRef.current !== target)
                 return;
             if (!res.ok) {
                 setDynamicCommandsError("动态命令加载失败");
@@ -75,27 +61,26 @@ export function useComposer(params) {
                     source,
                 });
             }
-            if (!isCurrent())
+            if (commandsSessionRef.current !== target)
                 return;
             setDynamicCommands(items);
-            // Compact server fail-soft / partial-source warning; local Operator/Web still merge.
-            const warning = typeof body?.warning === "string" ? body.warning.trim() : "";
-            setDynamicCommandsError(warning ? warning.slice(0, 160) : null);
         }
         catch {
-            if (!isCurrent())
+            if (commandsSessionRef.current !== target)
                 return;
             setDynamicCommandsError("动态命令加载失败");
             setDynamicCommands([]);
         }
         finally {
-            if (isCurrent()) {
+            if (commandsSessionRef.current === target) {
                 setDynamicCommandsLoading(false);
             }
         }
     }, [origin, sessionId]);
     // Lazy-load dynamic commands when slash palette opens or session changes.
     useEffect(() => {
+        setDynamicCommands([]);
+        setDynamicCommandsError(null);
         if (!sessionId)
             return;
         if (!shortcutOpen && commandsEpoch === 0)
@@ -187,14 +172,6 @@ export function useComposer(params) {
     const filteredShortcuts = useMemo(() => input.startsWith("/")
         ? filterSlashCommands(mergedCommands, input)
         : [], [input, mergedCommands]);
-    // Keep the active option index inside the current candidate range (UI-12
-    // AC-011): dynamic loads completing/failing empty, retries, session
-    // switches, late responses and search shrink all funnel through
-    // filteredShortcuts.length. The clamped index always matches a rendered
-    // `oc-shortcut-option-${globalIndex}` id (same source of truth).
-    useEffect(() => {
-        setShortcutIndex((index) => clampShortcutIndex(index, filteredShortcuts.length));
-    }, [filteredShortcuts.length]);
     const onCompositionStart = useCallback(() => {
         refs.isComposingRef.current = true;
     }, [refs]);

package/dist/worker/loop-agent/loop-agent-client.js

@@ -2,11 +2,15 @@ import { spawn } from "node:child_process";
 import { appendFileSync, realpathSync, statSync, writeFileSync } from "node:fs";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
-import { computeBinarySha256, computePackageFingerprint, findPackageRoot, isJavaScriptScript, readPackageName, readPackageVersion, resolveBinPaths, resolveCmdShim, } from "../../shared/package-metadata.js";
+import { computeBinarySha256, computePackageFingerprint, findPackageRoot, isJavaScriptScript, normalizeCliVersionLabel, readPackageName, readPackageVersion, resolveBinPaths, resolveCmdShim, } from "../../shared/package-metadata.js";
 import { parseCommandJson } from "./parse-json.js";
 export const DEFAULT_WORKER_COMMAND_TIMEOUT_MS = 120_000;
 export const DEFAULT_HEARTBEAT_INTERVAL_MS = 15_000;
 export const LOOP_AGENT_PACKAGE_NAME = "@tea-agent/loop-agent";
+/** Grace window between the SIGTERM and SIGKILL stages of a hard timeout, so a
+ * runner can persist terminal state (see executeDagCheckpoint) before being
+ * force-killed. */
+export const HARD_TIMEOUT_KILL_GRACE_MS = 10_000;
 const MAX_BUFFERED_OUTPUT_BYTES = 64 * 1024;
 /**
  * Bind evidence supplied by an orchestration layer to the identity exposed by
@@ -178,10 +182,11 @@ export class LoopAgentClient {
         if (!this._identity) {
             throw new Error("controller identity: cannot record a reported version without a pinned identity");
         }
-        if (reportedVersion !== this._identity.packageVersion) {
+        const normalized = normalizeCliVersionLabel(reportedVersion);
+        if (normalized !== this._identity.packageVersion) {
             throw new Error(`controller identity: reported version ${reportedVersion} does not match package version ${this._identity.packageVersion}`);
         }
-        this._identity = { ...this._identity, reportedVersion };
+        this._identity = { ...this._identity, reportedVersion: normalized };
         return this._identity;
     }
     async run(args, options) {
@@ -381,10 +386,17 @@ function spawnCommand(input) {
             });
         };
         let hardTimeout;
+        let killGraceTimeout;
         if (input.hardTimeoutMs !== undefined && input.hardTimeoutMs > 0) {
             hardTimeout = setTimeout(() => {
                 timedOut = true;
+                // Two-stage termination: SIGTERM first so the runner can persist a
+                // terminal state (see executeDagCheckpoint signal handler), then
+                // SIGKILL only after the grace window expires.
                 child.kill("SIGTERM");
+                killGraceTimeout = setTimeout(() => {
+                    child.kill("SIGKILL");
+                }, HARD_TIMEOUT_KILL_GRACE_MS);
             }, input.hardTimeoutMs);
         }
         let heartbeatTimer;
@@ -394,6 +406,8 @@ function spawnCommand(input) {
         const clearTimers = () => {
             if (hardTimeout !== undefined)
                 clearTimeout(hardTimeout);
+            if (killGraceTimeout !== undefined)
+                clearTimeout(killGraceTimeout);
             if (heartbeatTimer !== undefined) {
                 clearInterval(heartbeatTimer);
                 heartbeatTimer = undefined;

package/dist/worker/observability/read-model.js

@@ -1491,6 +1491,7 @@ function mergeDagRun(existing, incoming) {
         failureCategory: incoming.failureCategory ?? existing.failureCategory,
         stateConsistent: incoming.stateConsistent ?? existing.stateConsistent,
         recoveryEligibility: incoming.recoveryEligibility ?? existing.recoveryEligibility,
+        frontendRecovery: incoming.frontendRecovery ?? existing.frontendRecovery,
         title: incoming.title ?? existing.title,
         startedAt,
         finishedAt,
@@ -1790,6 +1791,23 @@ async function loadFrontendLintProjection(runDir) {
         blockingReasons: parsed.data.blockingReasons,
     };
 }
+function projectFrontendRecovery(state) {
+    const s = state.frontendRecoveryState;
+    const r = state.frontendRecoveryResult;
+    if (!s && !r)
+        return undefined;
+    return {
+        ...(s?.recoveryRootRunId ? { recoveryRootRunId: s.recoveryRootRunId } : {}),
+        ...(s?.parentRunId ? { parentRunId: s.parentRunId } : {}),
+        ...(s?.childRunId ? { childRunId: s.childRunId } : {}),
+        ...(s?.attemptIndex !== undefined ? { attemptIndex: s.attemptIndex } : {}),
+        ...(s?.continuationCount !== undefined
+            ? { continuationCount: s.continuationCount }
+            : {}),
+        ...(s?.phase ? { phase: s.phase } : {}),
+        ...(r?.outcome ? { outcome: r.outcome } : {}),
+    };
+}
 async function parseDagStateFile(statePath, now) {
     try {
         if (!existsSync(statePath))
@@ -1860,6 +1878,7 @@ async function parseDagStateFile(statePath, now) {
             loadBackendTestProjection(runDir, nodes),
             loadFrontendLintProjection(runDir),
         ]);
+        const frontendRecovery = projectFrontendRecovery(state);
         const continuationRecord = state.continuation &&
             typeof state.continuation.parentRunId === "string" &&
             typeof state.continuation.effectiveFromNodeId === "string" &&
@@ -1918,6 +1937,7 @@ async function parseDagStateFile(statePath, now) {
             ...(continuation ? { continuation } : {}),
             ...(backendTest ? { backendTest } : {}),
             ...(frontendLint ? { frontendLint } : {}),
+            ...(frontendRecovery ? { frontendRecovery } : {}),
         };
     }
     catch {

package/dist/worker/observe/static/copy.js

@@ -1,67 +1,67 @@
-/** Copy-only recommended commands (Observe UI R5). */
-import { el } from "./dom.js";
-
-export async function copyText(text) {
-	const value = String(text ?? "");
-	if (!value) return false;
-	try {
-		if (typeof navigator !== "undefined" && navigator.clipboard?.writeText) {
-			await navigator.clipboard.writeText(value);
-			return true;
-		}
-	} catch {
-		// fall through
-	}
-	try {
-		const ta = document.createElement("textarea");
-		ta.value = value;
-		ta.setAttribute("readonly", "");
-		ta.style.position = "fixed";
-		ta.style.left = "-9999px";
-		document.body.appendChild(ta);
-		ta.select();
-		const ok = document.execCommand("copy");
-		document.body.removeChild(ta);
-		return ok;
-	} catch {
-		return false;
-	}
-}
-
-/** Advisory recommended command: copy-only, never executes. */
-export function renderRecommendedCommand(action) {
-	const block = el("div", "recommended-command");
-	if (!action) {
-		block.appendChild(el("span", "muted", "缺失"));
-		return block;
-	}
-	const head = el("div", "recommended-command-head");
-	if (action.kind) {
-		head.appendChild(el("span", "recommended-command-kind", action.kind));
-	}
-	head.appendChild(
-		el("span", "recommended-command-label", action.label ?? "—"),
-	);
-	block.appendChild(head);
-	if (action.command) {
-		const body = el("div", "recommended-command-body");
-		const code = el("code", "recommended-command-text", action.command);
-		body.appendChild(code);
-		const btn = el("button", "copy-command", "复制");
-		btn.type = "button";
-		btn.addEventListener("click", (e) => {
-			e.preventDefault();
-			e.stopPropagation();
-			void copyText(action.command).then((ok) => {
-				btn.textContent = ok ? "已复制" : "复制失败";
-				setTimeout(() => {
-					btn.textContent = "复制";
-				}, 1500);
-			});
-		});
-		body.appendChild(btn);
-		block.appendChild(body);
-	}
-	return block;
-}
-
+/** Copy-only recommended commands (Observe UI R5). */
+import { el } from "./dom.js";
+
+export async function copyText(text) {
+	const value = String(text ?? "");
+	if (!value) return false;
+	try {
+		if (typeof navigator !== "undefined" && navigator.clipboard?.writeText) {
+			await navigator.clipboard.writeText(value);
+			return true;
+		}
+	} catch {
+		// fall through
+	}
+	try {
+		const ta = document.createElement("textarea");
+		ta.value = value;
+		ta.setAttribute("readonly", "");
+		ta.style.position = "fixed";
+		ta.style.left = "-9999px";
+		document.body.appendChild(ta);
+		ta.select();
+		const ok = document.execCommand("copy");
+		document.body.removeChild(ta);
+		return ok;
+	} catch {
+		return false;
+	}
+}
+
+/** Advisory recommended command: copy-only, never executes. */
+export function renderRecommendedCommand(action) {
+	const block = el("div", "recommended-command");
+	if (!action) {
+		block.appendChild(el("span", "muted", "缺失"));
+		return block;
+	}
+	const head = el("div", "recommended-command-head");
+	if (action.kind) {
+		head.appendChild(el("span", "recommended-command-kind", action.kind));
+	}
+	head.appendChild(
+		el("span", "recommended-command-label", action.label ?? "—"),
+	);
+	block.appendChild(head);
+	if (action.command) {
+		const body = el("div", "recommended-command-body");
+		const code = el("code", "recommended-command-text", action.command);
+		body.appendChild(code);
+		const btn = el("button", "copy-command", "复制");
+		btn.type = "button";
+		btn.addEventListener("click", (e) => {
+			e.preventDefault();
+			e.stopPropagation();
+			void copyText(action.command).then((ok) => {
+				btn.textContent = ok ? "已复制" : "复制失败";
+				setTimeout(() => {
+					btn.textContent = "复制";
+				}, 1500);
+			});
+		});
+		body.appendChild(btn);
+		block.appendChild(body);
+	}
+	return block;
+}
+

package/dist/worker/observe/static/dag-layout.d.ts

@@ -1,36 +1,36 @@
-export type DagLayoutNodeInput = { nodeId: string };
-export type DagLayoutEdgeInput = { from: string; to: string };
-export type DagLayoutNode = {
-	nodeId: string;
-	rank: number;
-	index: number;
-	x: number;
-	y: number;
-	width: number;
-	height: number;
-};
-export type DagLayoutEdge = DagLayoutEdgeInput & { path: string };
-export type DagLayout = {
-	width: number;
-	height: number;
-	nodes: DagLayoutNode[];
-	edges: DagLayoutEdge[];
-};
-
-export type DagLayoutOptions = Partial<{
-	nodeWidth: number;
-	nodeHeight: number;
-	rankGap: number;
-	nodeGap: number;
-	padding: number;
-	controlLaneCount: number;
-	/** Per-node visual card height overrides; ordinary ports still use nodeHeight axis. */
-	nodeHeights: Record<string, number>;
-}>;
-
-export function layoutDag(
-	nodes?: DagLayoutNodeInput[],
-	edges?: DagLayoutEdgeInput[],
-	ranks?: string[][],
-	options?: DagLayoutOptions,
-): DagLayout;
+export type DagLayoutNodeInput = { nodeId: string };
+export type DagLayoutEdgeInput = { from: string; to: string };
+export type DagLayoutNode = {
+	nodeId: string;
+	rank: number;
+	index: number;
+	x: number;
+	y: number;
+	width: number;
+	height: number;
+};
+export type DagLayoutEdge = DagLayoutEdgeInput & { path: string };
+export type DagLayout = {
+	width: number;
+	height: number;
+	nodes: DagLayoutNode[];
+	edges: DagLayoutEdge[];
+};
+
+export type DagLayoutOptions = Partial<{
+	nodeWidth: number;
+	nodeHeight: number;
+	rankGap: number;
+	nodeGap: number;
+	padding: number;
+	controlLaneCount: number;
+	/** Per-node visual card height overrides; ordinary ports still use nodeHeight axis. */
+	nodeHeights: Record<string, number>;
+}>;
+
+export function layoutDag(
+	nodes?: DagLayoutNodeInput[],
+	edges?: DagLayoutEdgeInput[],
+	ranks?: string[][],
+	options?: DagLayoutOptions,
+): DagLayout;