@prestyj/cli 5.6.0 → 5.8.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";
@@ -27,7 +28,6 @@ import { getAuthStorageKeys, getModel, getVideoByteLimit } from "../core/model-r
 import { SessionManager } from "../core/session-manager.js";
 import { log } from "../core/logger.js";
 import { getPendingUpdate, startPeriodicUpdateCheck, stopPeriodicUpdateCheck, } from "../core/auto-update.js";
-import { generateSessionTitle } from "../utils/session-title.js";
 import { SettingsManager } from "../core/settings-manager.js";
 import { PROMPT_COMMANDS, getPromptCommand } from "../core/prompt-commands.js";
 import { isFirstTimeSetup, markSetupAudited, getAnnouncedLanguages, markLanguagesAnnounced, } from "../core/setup-history.js";
@@ -234,22 +234,14 @@ export function App(props) {
     // measured further down; 0 means "not measured yet" and disables the
     // oversized-item flush below.
     const liveLayoutRef = useRef({ columns, liveAreaRows: 0 });
-    // Hoisted before terminal title hook so it can reference them
     const [lastUserMessage, setLastUserMessage] = useState("");
     // Bumped on every prompt submit; the fullscreen transcript scroll controller
     // watches this to snap back to the bottom so the newest output is visible.
     const [scrollResetToken, setScrollResetToken] = useState(0);
     const [exitPending, setExitPending] = useState(false);
     const [quittingSummary, setQuittingSummary] = useState(null);
-    // Terminal title — updated later after agentLoop is created
-    // (hoisted here so the hook is always called in the same order)
+    // Native terminal title keeps the active project visible outside the app frame.
     const [titleRunning, setTitleRunning] = useState(false);
-    const [sessionTitle, setSessionTitle] = useState(() => props.sessionStore?.sessionTitle);
-    const sessionTitleGeneratedRef = useRef(props.sessionStore?.sessionTitleGenerated ?? false);
-    useTerminalTitle({
-        isRunning: titleRunning,
-        sessionTitle,
-    });
     // Completed transcript rows are kept as durable session data but are no longer
     // rendered through Ink history. They are serialized once into real terminal
     // scrollback via terminalHistoryPrinter, while Ink owns only live rows and
@@ -353,6 +345,7 @@ export function App(props) {
     // Suppress "done" status when a plan overlay is about to open
     const planOverlayPendingRef = useRef(false);
     const [gitBranch, setGitBranch] = useState(null);
+    useTerminalTitle({ isRunning: titleRunning, cwd: displayedCwd, gitBranch });
     const [currentModel, setCurrentModel] = useState(props.model);
     const currentModelRef = useRef(props.model);
     const [currentProvider, setCurrentProvider] = useState(props.provider);
@@ -395,16 +388,13 @@ 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);
     const idealReviewEnabledRef = useRef(idealReviewEnabled);
     const [autoApprovePlansEnabled, setAutoApprovePlansEnabled] = useState(props.sessionStore?.autoApprovePlans ?? props.autoApprovePlans ?? true);
     const autoApprovePlansEnabledRef = useRef(autoApprovePlansEnabled);
-    /** Last actual API-reported input token count (from turn_end). */
-    const lastActualTokensRef = useRef(0);
-    /** Timestamp (ms) when lastActualTokensRef was last updated by turn_end. */
-    const lastActualTokensTimestampRef = useRef(0);
     /**
      * Languages whose style packs are currently injected into the system prompt.
      * Grown by `maybeInjectLanguagePacks` after `write`/`bash` tool results when
@@ -568,10 +558,6 @@ export function App(props) {
         if (sessionStore)
             sessionStore.planSteps = planSteps;
     }, [planSteps, sessionStore]);
-    useEffect(() => {
-        if (sessionStore)
-            sessionStore.sessionTitle = sessionTitle;
-    }, [sessionTitle, sessionStore]);
     useEffect(() => {
         if (sessionStore)
             sessionStore.overlay = overlay;
@@ -609,9 +595,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 +776,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
@@ -835,10 +824,9 @@ export function App(props) {
             });
         }
     }, [props.settingsFile]);
-    const { compactionAbortRef, compactConversation, transformContext } = useContextCompaction({
+    const { compactionAbortRef, compactConversation, transformContext, recordProviderUsage } = useContextCompaction({
         currentModel,
         currentProvider,
-        maxTokens: props.maxTokens,
         authStorage: props.authStorage,
         contextWindowOptions,
         activeApiKey,
@@ -850,8 +838,6 @@ export function App(props) {
         approvedPlanPathRef,
         settingsRef,
         messagesRef,
-        lastActualTokensRef,
-        lastActualTokensTimestampRef,
         persistCompactedSession,
     });
     // ── Background task bar state (external store) ──────────
@@ -904,6 +890,8 @@ export function App(props) {
         projectId: activeProjectId,
         resolveCredentials,
         transformContext,
+        lspManager: props.lspManager,
+        reviewCoverageTracker: props.reviewCoverageTracker,
         getIdealReviewMessage: (stats, touchedFiles) => {
             if (!idealReviewEnabledRef.current)
                 return null;
@@ -961,56 +949,7 @@ export function App(props) {
                 // Rebuild system prompt to remove the completed plan from context
                 void replaceSystemPrompt({ clearApprovedPlan: true });
             }
-            // Generate session title after the first turn (background, best-effort)
-            if (!sessionTitleGeneratedRef.current) {
-                sessionTitleGeneratedRef.current = true;
-                const msgs = messagesRef.current;
-                // Find the first user message and first assistant text
-                const userMsg = msgs.find((m) => m.role === "user");
-                const assistantMsg = msgs.find((m) => m.role === "assistant");
-                const userText = typeof userMsg?.content === "string"
-                    ? userMsg.content
-                    : Array.isArray(userMsg?.content)
-                        ? userMsg.content
-                            .filter((c) => c.type === "text")
-                            .map((c) => c.text)
-                            .join(" ")
-                        : "";
-                const assistantText = typeof assistantMsg?.content === "string"
-                    ? assistantMsg.content
-                    : Array.isArray(assistantMsg?.content)
-                        ? assistantMsg.content
-                            .filter((c) => c.type === "text")
-                            .map((c) => c.text)
-                            .join(" ")
-                        : "";
-                if (userText) {
-                    generateSessionTitle({
-                        provider: currentProvider,
-                        userMessage: userText,
-                        assistantPreview: assistantText.slice(0, 200),
-                        apiKey: activeApiKey,
-                        baseUrl: activeBaseUrl,
-                        accountId: activeAccountId,
-                        resolveCredentials,
-                    }).then((title) => {
-                        setSessionTitle(title);
-                        log("INFO", "title", `Session title generated: ${title}`);
-                    }, () => {
-                        // Best-effort — silently ignore failures
-                    });
-                }
-            }
-        }, [
-            persistNewMessages,
-            props.cwd,
-            props.skills,
-            currentProvider,
-            activeApiKey,
-            activeAccountId,
-            activeBaseUrl,
-            resolveCredentials,
-        ]),
+        }, [persistNewMessages, props.cwd, props.skills]),
         onTurnText: useCallback((text, thinking, thinkingMs) => {
             const hadStreamedAssistantFlush = streamedAssistantFlushRef.current.flushedChars > 0;
             const unflushedAssistantText = text.slice(streamedAssistantFlushRef.current.flushedChars);
@@ -1490,22 +1429,39 @@ export function App(props) {
                 return remaining;
             });
         }, [queueFlush]),
-        onTurnEnd: useCallback((turn, stopReason, usage) => {
+        onTurnEnd: useCallback((turn, stopReason, usage, timing) => {
+            recordProviderUsage(usage, messagesRef.current);
             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.
-            // All other providers share the context window — count both.
-            const inputContext = usage.inputTokens + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0);
-            lastActualTokensRef.current =
-                currentProvider === "anthropic" ? inputContext : inputContext + usage.outputTokens;
-            lastActualTokensTimestampRef.current = Date.now();
             // For tool-only turns (no text), flush completed items to finalized
             // history so liveItems doesn't grow unbounded across consecutive turns.
             setLiveItems((prev) => {
@@ -1515,7 +1471,7 @@ export function App(props) {
                 }
                 return remaining;
             });
-        }, [queueFlush]),
+        }, [currentModel, currentProvider, queueFlush, recordProviderUsage, sessionStore]),
         onDone: useCallback((durationMs, toolsUsed, runStats) => {
             log("INFO", "agent", `Agent done`, {
                 duration: `${durationMs}ms`,
@@ -1688,6 +1644,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 +1670,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
@@ -2251,8 +2210,6 @@ export function App(props) {
                     persistedIndexRef.current = messagesRef.current.length;
                 })();
                 agentLoop.reset();
-                setSessionTitle(undefined);
-                sessionTitleGeneratedRef.current = false;
                 setLiveItems([{ kind: "info", text: "Session cleared.", id: getId() }]);
             },
             openThemeSelector: () => setOverlay("theme"),
@@ -2786,6 +2743,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 +2772,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 +3374,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,