@prestyj/cli 5.6.0 → 5.7.0

package/dist/ui/App.js

@@ -13,6 +13,7 @@ import { useTaskBarStore, useTaskBarPolling, focusTaskBar, exitTaskBar, expandTa
 import { playNotificationSound } from "../utils/sound.js";
 import {} from "@prestyj/ai";
 import { downscaleForPreview, extractMediaPaths } from "../utils/image.js";
+import { buildSubAgentCompletionFollowUp, } from "../core/subagent-manager.js";
 import { useAgentLoop } from "./hooks/useAgentLoop.js";
 import { useTranscriptHistory } from "./hooks/useTranscriptHistory.js";
 import { createWebSearchTool } from "../tools/web-search.js";
@@ -395,6 +396,7 @@ export function App(props) {
     const sessionManagerRef = useRef(props.sessionsDir ? new SessionManager(props.sessionsDir) : null);
     const sessionPathRef = useRef(props.sessionStore?.sessionPath ?? props.sessionPath);
     const persistedIndexRef = useRef(messagesRef.current.length);
+    const turnMetricsRef = useRef(props.sessionStore?.turnMetrics ?? []);
     const sessionStatsRef = useRef(props.sessionStore?.sessionStats ??
         createSessionStats({ sessionId: props.sessionStore?.sessionId ?? props.sessionId }));
     const [idealReviewEnabled, setIdealReviewEnabled] = useState(props.sessionStore?.idealReviewEnabled ?? props.idealReviewEnabled ?? true);
@@ -609,9 +611,9 @@ export function App(props) {
         .map((key) => props.credentialsByProvider?.[key])
         .find((c) => c !== undefined);
     const activeApiKey = currentCreds?.accessToken ?? props.apiKey;
-    const activeAccountId = currentCreds?.accountId ?? props.accountId;
-    const activeProjectId = currentCreds?.projectId ?? props.projectId;
-    const activeBaseUrl = currentProvider === "gemini" ? undefined : (currentCreds?.baseUrl ?? props.baseUrl);
+    const activeAccountId = currentCreds ? currentCreds.accountId : props.accountId;
+    const activeProjectId = currentCreds ? currentCreds.projectId : props.projectId;
+    const activeBaseUrl = currentProvider === "gemini" ? undefined : currentCreds ? currentCreds.baseUrl : props.baseUrl;
     const contextWindowOptions = useMemo(() => ({ provider: currentProvider, accountId: activeAccountId }), [currentProvider, activeAccountId]);
     // Load git branch — re-runs whenever the displayed cwd changes (e.g. when
     // a pixel fix moves the agent into a different project root).
@@ -790,16 +792,19 @@ export function App(props) {
     useEffect(() => {
         void applyLanguageDetectionRef.current("initial");
     }, []);
+    const rebindSubagentsAfterCompaction = useCallback((sessionId) => props.subAgentManager?.rebindParentSession(sessionId) ?? Promise.resolve(), [props.subAgentManager]);
     const { persistCompactedSession, persistNewMessages } = useSessionPersistence({
         sessionManagerRef,
         sessionPathRef,
         sessionStatsRef,
         persistedIndexRef,
         messagesRef,
+        turnMetricsRef,
         cwdRef,
         currentProvider,
         currentModel,
         sessionStore,
+        onCompactedSession: rebindSubagentsAfterCompaction,
     });
     /**
      * Run the language detector against the current cwd. If the detected set is a
@@ -904,6 +909,8 @@ export function App(props) {
         projectId: activeProjectId,
         resolveCredentials,
         transformContext,
+        lspManager: props.lspManager,
+        reviewCoverageTracker: props.reviewCoverageTracker,
         getIdealReviewMessage: (stats, touchedFiles) => {
             if (!idealReviewEnabledRef.current)
                 return null;
@@ -1490,14 +1497,37 @@ export function App(props) {
                 return remaining;
             });
         }, [queueFlush]),
-        onTurnEnd: useCallback((turn, stopReason, usage) => {
+        onTurnEnd: useCallback((turn, stopReason, usage, timing) => {
             recordTurnEnd(sessionStatsRef.current, usage);
+            const metric = {
+                version: 1,
+                turn,
+                provider: currentProvider,
+                model: currentModel,
+                stopReason,
+                usage: { ...usage },
+                timing: { ...timing },
+                cost: {
+                    status: "unavailable",
+                    reason: "No authoritative effective-dated provider pricing is available",
+                },
+            };
+            turnMetricsRef.current.push(metric);
+            if (sessionStore)
+                sessionStore.turnMetrics = [...turnMetricsRef.current];
+            const metricSessionPath = sessionPathRef.current;
+            const metricManager = sessionManagerRef.current;
+            if (metricSessionPath && metricManager) {
+                void metricManager.appendTurnMetric(metricSessionPath, metric);
+            }
             log("INFO", "turn", `Turn ${turn} ended`, {
                 stopReason,
                 inputTokens: String(usage.inputTokens),
                 outputTokens: String(usage.outputTokens),
                 ...(usage.cacheRead != null && { cacheRead: String(usage.cacheRead) }),
                 ...(usage.cacheWrite != null && { cacheWrite: String(usage.cacheWrite) }),
+                providerDurationMs: String(timing.providerDurationMs),
+                ...(timing.ttftMs != null && { ttftMs: String(timing.ttftMs) }),
             });
             // Track actual token count for compaction decisions.
             // Anthropic has separate input/output limits — only count input.
@@ -1515,7 +1545,7 @@ export function App(props) {
                 }
                 return remaining;
             });
-        }, [queueFlush]),
+        }, [currentModel, currentProvider, queueFlush, sessionStore]),
         onDone: useCallback((durationMs, toolsUsed, runStats) => {
             log("INFO", "agent", `Agent done`, {
                 duration: `${durationMs}ms`,
@@ -1688,6 +1718,9 @@ export function App(props) {
         // natural completion boundary regardless. The stuck-guard caps
         // nudges per step so a genuinely blocked agent surfaces.
         getFollowUpMessages: useCallback(() => {
+            const childCompletionFollowUp = buildSubAgentCompletionFollowUp(props.subAgentManager);
+            if (childCompletionFollowUp)
+                return childCompletionFollowUp;
             const steps = planStepsRef.current;
             if (steps.length === 0 || !approvedPlanPathRef.current)
                 return null;
@@ -1711,7 +1744,7 @@ export function App(props) {
                         `or you genuinely need user input.`,
                 },
             ];
-        }, []),
+        }, [props.subAgentManager]),
         onRetry: useCallback(() => {
             // Roll back any pending progressive flushes from the aborted attempt.
             // Without this, a stall retry regenerates the preamble and the old
@@ -2786,6 +2819,10 @@ export function App(props) {
                     try {
                         const session = await sm.create(taskCwd, currentProvider, currentModel);
                         newSessionPath = session.path;
+                        sessionStatsRef.current.sessionId = session.id;
+                        if (props.sessionStore)
+                            props.sessionStore.sessionId = session.id;
+                        await props.subAgentManager?.resetParentSession(session.id);
                         log("INFO", "tasks", "New session for task", { path: session.path });
                     }
                     catch {
@@ -2811,22 +2848,27 @@ export function App(props) {
         agentLoop.reset();
         persistedIndexRef.current = messagesRef.current.length;
         const sm = sessionManagerRef.current;
-        if (sm) {
-            void sm.create(taskCwd, currentProvider, currentModel).then((session) => {
-                sessionPathRef.current = session.path;
-                log("INFO", "tasks", "New session for task", { path: session.path });
-            });
-        }
         const taskItem = { kind: "task", title, id: getId() };
         setLastUserMessage(title);
         setDoneStatus(null);
         setLiveItems([taskItem]);
-        void agentLoop.run(fullPrompt).catch((err) => {
-            if (agentLoop.isRunning) {
-                agentLoop.reset();
+        void (async () => {
+            try {
+                if (sm) {
+                    const session = await sm.create(taskCwd, currentProvider, currentModel);
+                    sessionPathRef.current = session.path;
+                    sessionStatsRef.current.sessionId = session.id;
+                    await props.subAgentManager?.resetParentSession(session.id);
+                    log("INFO", "tasks", "New session for task", { path: session.path });
+                }
+                await agentLoop.run(fullPrompt);
             }
-            setLiveItems((prev) => [...prev, toErrorItem(err, getId())]);
-        });
+            catch (err) {
+                if (agentLoop.isRunning)
+                    agentLoop.reset();
+                setLiveItems((prev) => [...prev, toErrorItem(err, getId())]);
+            }
+        })();
     }, [agentLoop, currentModel, currentProvider, props]);
     // Keep the ref in sync so stale closures (task picker, onDone run-all) can
     // start a task without being recreated each render.
@@ -3408,6 +3450,10 @@ export function App(props) {
                 if (sm) {
                     const s = await sm.create(props.cwd, currentProvider, currentModel);
                     newSessionPath = s.path;
+                    sessionStatsRef.current.sessionId = s.id;
+                    if (props.sessionStore)
+                        props.sessionStore.sessionId = s.id;
+                    await props.subAgentManager?.resetParentSession(s.id);
                 }
                 if (props.resetUI && props.sessionStore) {
                     // Clear the overlay so the new mount lands on the chat,