TypeScript
feat(pi): show extension status in existing controls (#23901)
Wout Stiens0d266fbe5211
diff --git a/apps/mobile/src/components/ui/Dialog.android.tsx b/apps/mobile/src/components/ui/Dialog.android.tsxindex af05275b7f2..89871fd99a8 100644--- a/apps/mobile/src/components/ui/Dialog.android.tsx+++ b/apps/mobile/src/components/ui/Dialog.android.tsx@@ -10,6 +10,7 @@ import {Text,useNativeState,} from "@expo/ui/jetpack-compose";+import { verticalScroll } from "@expo/ui/jetpack-compose/modifiers";import { useAppearancePreferences } from "../../features/settings/appearance/AppearancePreferencesProvider";import { useScaledTextRole } from "../../features/settings/appearance/useScaledTextRole";@@ -252,7 +253,9 @@ function DialogPresentation(props: DialogPresentationProps) {</AlertDialog.Text>) : props.request.message ? (<AlertDialog.Text>- <Text style={bodyTypography}>{props.request.message}</Text>+ <Text modifiers={[verticalScroll()]} style={bodyTypography}>+ {props.request.message}+ </Text></AlertDialog.Text>) : null}{actions.length > 1 ? (diff --git a/apps/mobile/src/features/threads/ThreadDetailScreen.tsx b/apps/mobile/src/features/threads/ThreadDetailScreen.tsxindex 9a2bfdb9fa8..27cce9c5795 100644--- a/apps/mobile/src/features/threads/ThreadDetailScreen.tsx+++ b/apps/mobile/src/features/threads/ThreadDetailScreen.tsx@@ -208,6 +208,7 @@ import type { ThreadContentPresentation } from "./threadContentPresentation";import { resolveThreadFeedSubmissionAnchor } from "./thread-feed-live-follow";import { useOpenLinkedThread } from "./useOpenLinkedThread";import { useGlobalVoiceInput } from "../voice-input/VoiceInputProvider";+import type { OrchestrationV2ProviderSession } from "@t3tools/contracts";export interface ThreadDetailScreenProps {readonly header?: React.ReactNode;@@ -240,6 +241,7 @@ export interface ThreadDetailScreenProps {readonly activeWorkStartedAt: string | null;readonly runlessWorkActive?: boolean;readonly providerSubagentStatus?: ProviderSubagentStatus | null;+ readonly extensionStatuses?: NonNullable<OrchestrationV2ProviderSession["extensionStatuses"]>;readonly isCompacting: boolean;readonly creationState:| {@@ -735,6 +737,13 @@ function ThreadDetailBody(const pendingBackgroundWork = presentPendingBackgroundWork(props.selectedThread.pendingBackgroundTasks,);+ const extensionStatus = props.extensionStatuses?.length+ ? {+ label: `Pi · ${props.extensionStatuses.map((status) => status.text).join(" · ")}`,+ onPress: () =>+ Dialog.alert("Pi", props.extensionStatuses?.map((status) => status.text).join("\n\n")),+ }+ : null;const floatingStatus = ((): FloatingWorkingStatus | null => {const connectionStatus = connectionFloatingStatus({connectionError: connectionRetrying ? retryConnectionError : props.connectionError,@@ -864,6 +873,9 @@ function ThreadDetailBody(accessibilityLabel: `${goal.title}: ${goal.objective}`,};}+ if (extensionStatus !== null && contentPresentationKind === "ready") {+ return { kind: "extension", ...extensionStatus };+ }return null;})();const showWorkingControl = floatingStatus !== null;@@ -1602,6 +1614,16 @@ function ThreadDetailBody(<FloatingWorkingControlcolorScheme={isDarkMode ? "dark" : "light"}status={floatingStatus}+ extensionStatus={+ floatingStatus !== null &&+ (floatingStatus.kind === "working" ||+ floatingStatus.kind === "compacting" ||+ floatingStatus.kind === "background" ||+ floatingStatus.kind === "goal" ||+ floatingStatus.kind === "lifecycle")+ ? extensionStatus+ : null+ }lift={floatingControlLift}devicePreview={devicePreviews.length > 0diff --git a/apps/mobile/src/features/threads/ThreadRouteScreen.tsx b/apps/mobile/src/features/threads/ThreadRouteScreen.tsxindex 62c1b039540..4aecde3be74 100644--- a/apps/mobile/src/features/threads/ThreadRouteScreen.tsx+++ b/apps/mobile/src/features/threads/ThreadRouteScreen.tsx@@ -991,6 +991,7 @@ function ThreadRouteContent(}isCompacting={composer.isCompacting}runlessWorkActive={composer.runlessWorkActive}+ extensionStatuses={composer.extensionStatuses}providerSubagentStatus={composer.providerSubagentStatus}creationState={creationState}setupWorkingStartedAt={diff --git a/apps/mobile/src/features/threads/floating-working-control.tsx b/apps/mobile/src/features/threads/floating-working-control.tsxindex 1dc95a85b2d..4ef096c1000 100644--- a/apps/mobile/src/features/threads/floating-working-control.tsx+++ b/apps/mobile/src/features/threads/floating-working-control.tsx@@ -69,6 +69,7 @@ export const FLOATING_WORKING_CONTROL_COVERAGE = CONTROL_OVERLAY_OFFSET + CONTROexport function FloatingWorkingControl(props: {readonly colorScheme: "light" | "dark";readonly status: FloatingWorkingStatus | null;+ readonly extensionStatus?: { readonly label: string; readonly onPress: () => void } | null;readonly devicePreview: { readonly count: number; readonly onPress: () => void } | null;readonly browserPreview: { readonly count: number; readonly onPress: () => void } | null;readonly showScrollToEnd: boolean;@@ -84,6 +85,10 @@ export function FloatingWorkingControl(props: {const [overlayWidth, setOverlayWidth] = useState(windowWidth);const [queueWidth, setQueueWidth] = useState(0);const [actionWidth, setActionWidth] = useState(0);+ const [extensionWidth, setExtensionWidth] = useState(0);+ const extensionStatus = props.extensionStatus ?? null;+ const extensionOnly = props.status?.kind === "extension";+ const useGlass = NATIVE_LIQUID_GLASS_SUPPORTED && !extensionOnly;const action =props.status?.kind === "background" ||props.status?.kind === "lifecycle" ||@@ -96,7 +101,7 @@ export function FloatingWorkingControl(props: {const [previewWidth, setPreviewWidth] = useState(0);const agents = props.agents;const hasAgents = agents !== null;- const labelWidth = Math.max(+ const availableLabelWidth = Math.max(0,Math.min(overlayWidth, windowWidth) -CONTROL_HEIGHT -@@ -106,6 +111,10 @@ export function FloatingWorkingControl(props: {(hasAgents ? agentsWidth : 0) -(hasPreview ? previewWidth : 0),);+ const labelWidth = Math.max(+ 0,+ availableLabelWidth - (extensionStatus === null ? 0 : extensionWidth),+ );const separationProgress = useSharedValue(props.showScrollToEnd ? 1 : 0);// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- animates the Reanimated separation value when scroll-to-end visibility changes@@ -163,10 +172,16 @@ export function FloatingWorkingControl(props: {(props.devicePreview !== null && props.browserPreview !== null);const statusInteractive =props.status?.kind === "connection" ||+ props.status?.kind === "extension" ||props.status?.kind === "child-input" ||props.status?.kind === "background";const capsuleInteractive =- statusInteractive || action !== null || hasQueue || hasAgents || hasPreview;+ statusInteractive ||+ extensionStatus !== null ||+ action !== null ||+ hasQueue ||+ hasAgents ||+ hasPreview;const statusContent =props.status !== null ? (<View@@ -181,7 +196,9 @@ export function FloatingWorkingControl(props: {><FloatingStatusLabelkey={- props.status.kind === "working" || props.status.kind === "compacting"+ props.status.kind === "working" ||+ props.status.kind === "compacting" ||+ props.status.kind === "extension"? props.status.kind: `${props.status.kind}:${props.status.label}`}@@ -195,6 +212,22 @@ export function FloatingWorkingControl(props: {const capsuleContent = (<View className="flex-row items-center">{statusContent}+ {extensionStatus !== null ? (+ <Pressable+ accessibilityRole="button"+ accessibilityLabel={extensionStatus.label}+ accessibilityHint="Shows the full Pi status"+ onPress={extensionStatus.onPress}+ onLayout={(event) => setExtensionWidth(settleWidth(event.nativeEvent.layout.width))}+ style={{ maxWidth: availableLabelWidth * 0.5 }}+ className="h-11 flex-row items-center px-3 active:opacity-70"+ >+ {hasStatus ? <View className="absolute left-0 h-4 w-px bg-border" /> : null}+ <Text className="shrink font-t3-medium text-xs text-foreground" numberOfLines={1}>+ {extensionStatus.label}+ </Text>+ </Pressable>+ ) : null}{action !== null ? (<ViewonLayout={(event) => setActionWidth(settleWidth(event.nativeEvent.layout.width))}@@ -273,10 +306,10 @@ export function FloatingWorkingControl(props: {className="absolute left-0 right-0 z-20 items-center"style={[{ top: -CONTROL_OVERLAY_OFFSET }, liftStyle]}onLayout={(event) => setOverlayWidth(event.nativeEvent.layout.width)}- entering={NATIVE_LIQUID_GLASS_SUPPORTED || reducedMotion ? undefined : CONTROL_ENTERING}- exiting={NATIVE_LIQUID_GLASS_SUPPORTED || reducedMotion ? undefined : CONTROL_EXITING}+ entering={useGlass || extensionOnly || reducedMotion ? undefined : CONTROL_ENTERING}+ exiting={useGlass || extensionOnly || reducedMotion ? undefined : CONTROL_EXITING}>- {hasCapsule && NATIVE_LIQUID_GLASS_SUPPORTED ? (+ {hasCapsule && useGlass ? (<UniwindGlassContainerspacing={GLASS_MERGE_SPACING}pointerEvents="box-none"@@ -374,6 +407,23 @@ function FloatingStatusLabel(props: {readonly status: FloatingWorkingStatus;readonly onLayout: (event: LayoutChangeEvent) => void;}) {+ if (props.status.kind === "extension") {+ return (+ <StatusLabelRow+ accessibilityLabel={props.status.label}+ accessibilityRole="button"+ onPress={props.status.onPress}+ onLayout={props.onLayout}+ className="gap-1.5"+ animated={false}+ >+ <Text className="shrink font-t3-medium text-xs text-foreground" numberOfLines={1}>+ {props.status.label}+ </Text>+ <SymbolView name="chevron.down" size={10} tintColorClassName="accent-foreground" />+ </StatusLabelRow>+ );+ }if (props.status.kind === "syncing") {return (<StatusLabelRow@@ -546,6 +596,7 @@ function FloatingStatusLabel(props: {}function StatusLabelRow(props: {+ readonly animated?: boolean;readonly accessibilityLabel?: string;readonly accessibilityRole?: "button";readonly className?: string;@@ -558,8 +609,8 @@ function StatusLabelRow(props: {return (<Animated.ViewclassName="absolute max-w-full"- entering={reducedMotion ? undefined : LABEL_ENTERING}- exiting={reducedMotion ? undefined : LABEL_EXITING}+ entering={props.animated === false || reducedMotion ? undefined : LABEL_ENTERING}+ exiting={props.animated === false || reducedMotion ? undefined : LABEL_EXITING}onLayout={props.onLayout}>{props.onPress ? (diff --git a/apps/mobile/src/features/threads/floating-working-status.ts b/apps/mobile/src/features/threads/floating-working-status.tsindex 2892b4aafa5..e3c137ebfd2 100644--- a/apps/mobile/src/features/threads/floating-working-status.ts+++ b/apps/mobile/src/features/threads/floating-working-status.ts@@ -38,6 +38,7 @@ export type FloatingWorkingStatus =readonly action: FloatingStatusAction | null;}| { readonly kind: "goal"; readonly label: string; readonly accessibilityLabel: string }+ | { readonly kind: "extension"; readonly label: string; readonly onPress: () => void }| { readonly kind: "preparing"; readonly label: string }| {readonly kind: "connection";diff --git a/apps/mobile/src/state/use-thread-composer-state.ts b/apps/mobile/src/state/use-thread-composer-state.tsindex 3e3c645cf3d..4700aac8a1b 100644--- a/apps/mobile/src/state/use-thread-composer-state.ts+++ b/apps/mobile/src/state/use-thread-composer-state.ts@@ -9,6 +9,7 @@ import type { ThreadCheckpointSummary } from "@t3tools/client-runtime/state/threimport { resolvePendingHandoff } from "@t3tools/client-runtime/handoff";import {deriveProviderSubagentStatus,+ deriveProviderExtensionStatuses,deriveResumableRunId,deriveRunlessWorkStartedAt,deriveThreadActivityRun,@@ -874,6 +875,9 @@ export function useThreadComposerState(input: {dispatchingQueuedMessageId,activeWorkStartedAt,runlessWorkActive,+ extensionStatuses: deriveProviderExtensionStatuses(+ selectedThreadProjection?.projection ?? null,+ ),providerSubagentStatus,isCompacting,composerDraftKey,diff --git a/apps/server/src/orchestration-v2/ProjectionRecovery.test.ts b/apps/server/src/orchestration-v2/ProjectionRecovery.test.tsindex a4914fdee45..0868b3b6948 100644--- a/apps/server/src/orchestration-v2/ProjectionRecovery.test.ts+++ b/apps/server/src/orchestration-v2/ProjectionRecovery.test.ts@@ -21,6 +21,7 @@ import {import * as DateTime from "effect/DateTime";import * as Effect from "effect/Effect";import * as Layer from "effect/Layer";+import * as Stream from "effect/Stream";import * as SqlClient from "effect/sql/SqlClient";import * as Statement from "effect/sql/Statement";@@ -263,6 +264,103 @@ it.effect("stops a session its thread detached, which kept its live status", ()}).pipe(Effect.provide(layerRecoveryTest)),);+it.effect.each(["attached", "detached", "replaced"] as const)(+ "recovers attached sessions without restoring detached errors, session=%s",+ (state) =>+ Effect.gen(function* () {+ const projections = yield* ProjectionStore.ProjectionStoreV2;+ const recovery = yield* ProviderRuntimeRecovery.ProviderRuntimeRecoveryService;+ const now = yield* DateTime.now;+ const threadId = yield* createThread("failed-status-session");+ const providerSessionId = ProviderSessionId.make("session:recovery:failed-status");+ const session = {+ id: providerSessionId,+ driver,+ providerInstanceId,+ status: "error" as const,+ cwd: "/workspace",+ model: modelSelection.model,+ capabilities: CodexProviderCapabilitiesV2,+ extensionStatuses: [{ key: "watch", text: "Watching" }],+ createdAt: now,+ updatedAt: now,+ lastError: "Rate limited",+ };+ yield* projections.apply({+ id: EventId.make("event:recovery:failed-status:attached"),+ type: "provider-session.attached",+ threadId,+ driver,+ providerInstanceId,+ occurredAt: now,+ payload: session,+ });+ if (state !== "attached") {+ yield* projections.apply({+ id: EventId.make("event:recovery:failed-status:detached"),+ type: "provider-session.detached",+ threadId,+ driver,+ providerInstanceId,+ occurredAt: now,+ payload: { providerSessionId, detachedAt: now, reason: "Thread settled." },+ });+ }+ const replacementSessionId = ProviderSessionId.make("session:recovery:replacement");+ if (state === "replaced") {+ yield* projections.apply({+ id: EventId.make("event:recovery:replacement:attached"),+ type: "provider-session.attached",+ threadId,+ driver,+ providerInstanceId,+ occurredAt: now,+ payload: {+ ...session,+ id: replacementSessionId,+ status: "ready",+ extensionStatuses: [],+ lastError: null,+ },+ });+ yield* createRun(threadId, "completed");+ }+ assert.deepEqual(+ yield* projections.getRecoveryThreadIds("runtime"),+ state === "detached" ? [] : [threadId],+ );+ yield* recovery.reconcile("startup");+ const eventStore = yield* EventStore.EventStoreV2;+ const stored = yield* eventStore.read({ threadId }).pipe(Stream.runCollect);+ const sessionUpdates = stored.flatMap(({ event }) =>+ event.type === "provider-session.updated"+ ? [+ {+ id: event.payload.id,+ status: event.payload.status,+ lastError: event.payload.lastError,+ extensionStatuses: event.payload.extensionStatuses,+ },+ ]+ : [],+ );+ assert.deepEqual(+ sessionUpdates,+ state === "detached"+ ? []+ : [+ {+ id: state === "attached" ? providerSessionId : replacementSessionId,+ status: state === "attached" ? "error" : "stopped",+ lastError: state === "attached" ? "Rate limited" : null,+ extensionStatuses: [],+ },+ ],+ );+ assert.deepEqual(yield* projections.getRecoveryThreadIds("runtime"), []);+ }).pipe(Effect.provide(layerRecoveryTest)),+);+it.effect("selects unfinished recovery work without reading settled thread histories", () =>Effect.gen(function* () {const projections = yield* ProjectionStore.ProjectionStoreV2;diff --git a/apps/server/src/orchestration-v2/ProjectionStore.ts b/apps/server/src/orchestration-v2/ProjectionStore.tsindex 28bf88f3892..22f5743c103 100644--- a/apps/server/src/orchestration-v2/ProjectionStore.ts+++ b/apps/server/src/orchestration-v2/ProjectionStore.ts@@ -4200,6 +4200,9 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =CROSS JOIN orchestration_v2_projection_provider_session_bindings AS bindingsON bindings.provider_session_id = sessions.provider_session_idWHERE sessions.status NOT IN ('stopped', 'error')+ OR (sessions.status = 'error' AND CASE WHEN json_valid(sessions.payload_json)+ THEN json_array_length(sessions.payload_json, '$.extensionStatuses') > 0+ ELSE 0 END)UNION-- A detach drops the binding but keeps the session's status.SELECT sessions.thread_id@@ -4702,6 +4705,9 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =)AND (session.status NOT IN ('stopped', 'error')+ OR (session.status = 'error' AND CASE WHEN json_valid(session.payload_json)+ THEN json_array_length(session.payload_json, '$.extensionStatuses') > 0+ ELSE 0 END)OR session.provider_session_id IN (SELECT provider_thread.provider_session_idFROM orchestration_v2_projection_provider_threads AS provider_threaddiff --git a/apps/server/src/orchestration-v2/ProviderRuntimeRecoveryService.test.ts b/apps/server/src/orchestration-v2/ProviderRuntimeRecoveryService.test.tsindex 28f1df58a6b..642a642a80d 100644--- a/apps/server/src/orchestration-v2/ProviderRuntimeRecoveryService.test.ts+++ b/apps/server/src/orchestration-v2/ProviderRuntimeRecoveryService.test.ts@@ -684,6 +684,7 @@ it.effect(driver: ProviderDriverKind.make("codex"),providerInstanceId: ProviderInstanceId.make("codex"),status: "ready",+ extensionStatuses: [{ key: "watch", text: "Watching" }],},],providerThreads: [@@ -798,6 +799,13 @@ it.effect();const messageEvent = events.find((event) => event.type === "message.updated");assert.isFalse(messageEvent?.type === "message.updated" && messageEvent.payload.streaming);+ const stoppedSession = events.find((event) => event.type === "provider-session.updated");+ assert.deepEqual(+ stoppedSession?.type === "provider-session.updated"+ ? stoppedSession.payload.extensionStatuses+ : undefined,+ [],+ );assert.deepEqual(events.flatMap((event) =>event.type === "turn-item.updated" && "streaming" in event.payloaddiff --git a/apps/server/src/orchestration-v2/ProviderRuntimeRecoveryService.ts b/apps/server/src/orchestration-v2/ProviderRuntimeRecoveryService.tsindex 5abaab7f122..a20b5cbfc29 100644--- a/apps/server/src/orchestration-v2/ProviderRuntimeRecoveryService.ts+++ b/apps/server/src/orchestration-v2/ProviderRuntimeRecoveryService.ts@@ -701,7 +701,9 @@ export const make = Effect.gen(function* () {});}for (const session of projection.providerSessions.filter(- (candidate) => candidate.status !== "stopped" && candidate.status !== "error",+ (candidate) =>+ (candidate.status !== "stopped" && candidate.status !== "error") ||+ (candidate.status === "error" && (candidate.extensionStatuses?.length ?? 0) > 0),)) {events.push({id: yield* allocateEventId(),@@ -710,7 +712,13 @@ export const make = Effect.gen(function* () {driver: session.driver,providerInstanceId: session.providerInstanceId,occurredAt: now,- payload: { ...session, status: "stopped", updatedAt: now, lastError: null },+ payload: {+ ...session,+ status: session.status === "error" ? "error" : "stopped",+ ...(session.extensionStatuses === undefined ? {} : { extensionStatuses: [] }),+ updatedAt: now,+ lastError: session.status === "error" ? session.lastError : null,+ },});}for (const [providerThreadId, work] of cancelledBackgroundWork) {diff --git a/apps/server/src/orchestration-v2/ProviderSessionManager.test.ts b/apps/server/src/orchestration-v2/ProviderSessionManager.test.tsindex d5556128ce7..da6774ae235 100644--- a/apps/server/src/orchestration-v2/ProviderSessionManager.test.ts+++ b/apps/server/src/orchestration-v2/ProviderSessionManager.test.ts@@ -423,6 +423,7 @@ const makeProviderAdapter = Effect.fnUntraced(function* (options: {readonly failEventStream?: boolean;readonly capabilities?: OrchestrationV2ProviderCapabilities;+ readonly extensionStatuses?: OrchestrationV2ProviderSession["extensionStatuses"];readonly mcpConfigs?: Ref.Ref<ReadonlyArray<McpProviderSession.McpProviderSessionConfig | undefined>>;@@ -479,11 +480,16 @@ const makeProviderAdapter = Effect.fnUntraced(function* (}const now = yield* DateTime.now;const events = yield* Queue.unbounded<ProviderAdapter.ProviderAdapterV2Event, Cause.Done>();- const session = makeProviderSession({- providerSessionId: input.providerSessionId,- now,- ...(options.capabilities === undefined ? {} : { capabilities: options.capabilities }),- });+ let session: OrchestrationV2ProviderSession = {+ ...makeProviderSession({+ providerSessionId: input.providerSessionId,+ now,+ ...(options.capabilities === undefined ? {} : { capabilities: options.capabilities }),+ }),+ ...(options.extensionStatuses === undefined+ ? {}+ : { extensionStatuses: options.extensionStatuses }),+ };yield* Ref.update(state, (current) => {const eventQueues = new Map(current.eventQueues);eventQueues.set(String(input.providerSessionId), events);@@ -502,7 +508,9 @@ const makeProviderAdapter = Effect.fnUntraced(function* (instanceId: ProviderInstanceId.make("codex"),driver: CODEX_DRIVER,providerSessionId: input.providerSessionId,- providerSession: session,+ get providerSession() {+ return session;+ },events: options.failEventStream? Stream.fail(new ProviderAdapter.ProviderAdapterEventStreamError({@@ -511,7 +519,13 @@ const makeProviderAdapter = Effect.fnUntraced(function* (cause: "process exited",}),)- : Stream.fromQueue(events),+ : Stream.fromQueue(events).pipe(+ Stream.tap((event) =>+ Effect.sync(() => {+ if (event.type === "provider_session.updated") session = event.providerSession;+ }),+ ),+ ),...(options.backgroundTasksEndWithProcess === false? {}: { backgroundTasksEndWithProcess: true as const }),@@ -563,6 +577,7 @@ function layerTest(input: {readonly maxIdlePinMs?: number;readonly failEventStream?: boolean;readonly capabilities?: OrchestrationV2ProviderCapabilities;+ readonly extensionStatuses?: OrchestrationV2ProviderSession["extensionStatuses"];readonly mcpConfigs?: Ref.Ref<ReadonlyArray<McpProviderSession.McpProviderSessionConfig | undefined>>;@@ -604,6 +619,9 @@ function layerTest(input: {makeProviderAdapter(input.state, {failEventStream: input.failEventStream ?? false,...(input.capabilities === undefined ? {} : { capabilities: input.capabilities }),+ ...(input.extensionStatuses === undefined+ ? {}+ : { extensionStatuses: input.extensionStatuses }),...(input.mcpConfigs === undefined ? {} : { mcpConfigs: input.mcpConfigs }),...(input.beforeOpen === undefined ? {} : { beforeOpen: input.beforeOpen }),...(input.hasPendingBackgroundWork === undefined@@ -1657,6 +1675,242 @@ it.effect("ProviderSessionManagerV2 stops a session still opening when its layer}),);+it.effect(+ "ProviderSessionManagerV2 projects idle extension statuses and rejects a retired runtime's updates",+ () =>+ Effect.gen(function* () {+ const state = yield* Ref.make(emptyState);+ yield* Effect.gen(function* () {+ const eventSink = yield* EventSink.EventSinkV2;+ const idAllocator = yield* IdAllocator.IdAllocatorV2;+ const manager = yield* ProviderSessionManager.ProviderSessionManagerV2;+ const projectionStore = yield* ProjectionStore.ProjectionStoreV2;+ const threadId = ThreadId.make("thread-extension-status");+ const providerSessionId = yield* idAllocator.allocate.providerSession({+ providerInstanceId: modelSelection.instanceId,+ threadId,+ });+ yield* eventSink.write({+ events: [+ yield* makeThreadCreatedEvent({ idAllocator, threadId, now: yield* DateTime.now }),+ ],+ });+ const runtime = yield* manager.open({+ threadId,+ providerSessionId,+ modelSelection,+ runtimePolicy,+ });+ const firstClient = yield* runtime.subscribeEvents!;+ const secondClient = yield* runtime.subscribeEvents!;+ const oldQueue = (yield* Ref.get(state)).eventQueues.get(String(providerSessionId));+ assert.isDefined(oldQueue);+ const statuses = [{ key: "watch", text: "Watching 4 files" }];+ yield* Queue.offer(oldQueue!, {+ type: "provider_session.updated",+ driver: CODEX_DRIVER,+ providerSession: { ...runtime.providerSession, extensionStatuses: statuses },+ });+ yield* Effect.all([+ firstClient.events.pipe(Stream.runHead),+ secondClient.events.pipe(Stream.runHead),+ ]);+ assert.deepEqual(+ (yield* projectionStore.getThreadProjection(threadId)).providerSessions.at(-1)+ ?.extensionStatuses,+ statuses,+ );+ const reused = yield* manager.open({+ threadId,+ providerSessionId,+ modelSelection,+ runtimePolicy,+ });+ assert.deepEqual(reused.providerSession.extensionStatuses, statuses);+ yield* eventSink.write({+ events: [+ {+ id: yield* idAllocator.allocate.event({ threadId, providerSessionId }),+ type: "provider-session.updated",+ threadId,+ driver: CODEX_DRIVER,+ providerInstanceId: modelSelection.instanceId,+ occurredAt: yield* DateTime.now,+ payload: reused.providerSession,+ },+ ],+ });+ assert.deepEqual(+ (yield* projectionStore.getThreadProjection(threadId)).providerSessions.at(-1)+ ?.extensionStatuses,+ statuses,+ );+ yield* manager.close(providerSessionId);+ assert.deepEqual(+ (yield* projectionStore.getThreadProjection(threadId)).providerSessions.at(-1)+ ?.extensionStatuses,+ [],+ );+ const replacement = yield* manager.open({+ threadId,+ providerSessionId,+ modelSelection,+ runtimePolicy,+ });+ const replacementClient = yield* replacement.subscribeEvents!;+ const newQueue = (yield* Ref.get(state)).eventQueues.get(String(providerSessionId));+ assert.isDefined(newQueue);+ yield* Queue.offer(oldQueue!, {+ type: "provider_session.updated",+ driver: CODEX_DRIVER,+ providerSession: {+ ...runtime.providerSession,+ extensionStatuses: [{ key: "stale", text: "Old session" }],+ },+ });+ yield* Queue.offer(newQueue!, {+ type: "provider_session.updated",+ driver: CODEX_DRIVER,+ providerSession: {+ ...replacement.providerSession,+ extensionStatuses: [{ key: "new", text: "New session" }],+ },+ });+ yield* replacementClient.events.pipe(Stream.runHead);+ assert.deepEqual(+ (yield* projectionStore.getThreadProjection(threadId)).providerSessions.at(-1)+ ?.extensionStatuses,+ [{ key: "new", text: "New session" }],+ );+ assert.lengthOf((yield* projectionStore.getThreadProjection(threadId)).messages, 0);+ assert.lengthOf((yield* projectionStore.getThreadProjection(threadId)).turnItems, 0);+ }).pipe(+ Effect.provide(+ layerTest({+ state,+ idleTimeoutMs: 60_000,+ extensionStatuses: [{ key: "initial", text: "Watching" }],+ }),+ ),+ );+ }),+);++it.effect.each(["session metadata", "session status changes", "provider work"] as const)(+ "ProviderSessionManagerV2 expires idle sessions according to %s",+ (activity) =>+ Effect.gen(function* () {+ const state = yield* Ref.make(emptyState);+ yield* Effect.gen(function* () {+ const eventSink = yield* EventSink.EventSinkV2;+ const idAllocator = yield* IdAllocator.IdAllocatorV2;+ const manager = yield* ProviderSessionManager.ProviderSessionManagerV2;+ const projectionStore = yield* ProjectionStore.ProjectionStoreV2;+ const threadId = ThreadId.make("thread-session-metadata-idle");+ const providerSessionId = yield* idAllocator.allocate.providerSession({+ providerInstanceId: modelSelection.instanceId,+ threadId,+ });+ yield* eventSink.write({+ events: [+ yield* makeThreadCreatedEvent({ idAllocator, threadId, now: yield* DateTime.now }),+ ],+ });+ const runtime = yield* manager.open({+ threadId,+ providerSessionId,+ modelSelection,+ runtimePolicy,+ });+ const subscriber = yield* runtime.subscribeEvents!;+ const observed = yield* Queue.unbounded<ProviderAdapter.ProviderAdapterV2Event>();+ yield* subscriber.events.pipe(+ Stream.runForEach((event) => Queue.offer(observed, event)),+ Effect.ignore,+ Effect.forkScoped,+ );+ const queue = (yield* Ref.get(state)).eventQueues.get(String(providerSessionId));+ assert.isDefined(queue);+ const waitingSession = { ...runtime.providerSession, status: "waiting" as const };+ yield* Queue.offer(queue!, {+ type: "provider_session.updated",+ driver: CODEX_DRIVER,+ providerSession: waitingSession,+ });+ yield* Queue.take(observed);++ for (const text of ["Watching 1 file", "Watching 2 files"]) {+ yield* TestClock.adjust("300 millis");+ yield* Queue.offer(queue!, {+ type: "provider_session.updated",+ driver: CODEX_DRIVER,+ providerSession: {+ ...waitingSession,+ extensionStatuses: [{ key: "watch", text }],+ },+ });+ yield* Queue.take(observed);+ }+ yield* TestClock.adjust("300 millis");+ const statuses = [{ key: "watch", text: "Watching 3 files" }];+ yield* Queue.offer(+ queue!,+ activity === "provider work"+ ? {+ type: "provider_thread.updated",+ driver: CODEX_DRIVER,+ providerThread: makeProviderThread({+ idAllocator,+ threadId,+ providerSessionId,+ now: yield* DateTime.now,+ }),+ }+ : {+ type: "provider_session.updated",+ driver: CODEX_DRIVER,+ providerSession: {+ ...waitingSession,+ status: activity === "session status changes" ? "ready" : "waiting",+ extensionStatuses: statuses,+ },+ },+ );+ yield* Queue.take(observed);+ if (activity !== "provider work") {+ assert.deepEqual(+ (yield* projectionStore.getThreadProjection(threadId)).providerSessions.at(-1)+ ?.extensionStatuses,+ statuses,+ );+ }+ const afterSequence = yield* eventSink.latestSequence({ threadId });+ yield* TestClock.adjust("100 millis");+ assert.equal(yield* manager.isLive(providerSessionId), activity !== "session metadata");+ if (activity !== "session metadata") {+ yield* TestClock.adjust("900 millis");+ }+ assert.isTrue(Option.isNone(yield* manager.get(providerSessionId)));+ yield* eventSink+ .stream({ threadId, afterSequence, eventType: "provider-session.updated" })+ .pipe(+ Stream.filter(+ (stored) =>+ stored.event.type === "provider-session.updated" &&+ stored.event.payload.status === "stopped",+ ),+ Stream.runHead,+ );+ assert.deepEqual(+ (yield* projectionStore.getThreadProjection(threadId)).providerSessions.at(-1)+ ?.extensionStatuses,+ [],+ );+ assert.equal((yield* Ref.get(state)).closeCount, 1);+ }).pipe(Effect.provide(layerTest({ state, idleTimeoutMs: 1_000 })));+ }),+);+it.effect("ProviderSessionManagerV2 interrupts event subscriptions on server shutdown", () =>Effect.gen(function* () {const state = yield* Ref.make(emptyState);diff --git a/apps/server/src/orchestration-v2/ProviderSessionManager.ts b/apps/server/src/orchestration-v2/ProviderSessionManager.tsindex f06011676c6..3b01de25bc1 100644--- a/apps/server/src/orchestration-v2/ProviderSessionManager.ts+++ b/apps/server/src/orchestration-v2/ProviderSessionManager.ts@@ -621,6 +621,9 @@ export const layerWithOptions = (const payload: OrchestrationV2ProviderSession = {...input.entry.runtime.providerSession,status: releaseStatusFor(input.reason),+ ...(input.entry.runtime.providerSession.extensionStatuses === undefined+ ? {}+ : { extensionStatuses: [] }),updatedAt: now,lastError:input.reason === "runtime_error" ? (input.detail ?? "Provider runtime failed.") : null,@@ -1202,8 +1205,8 @@ export const layerWithOptions = (// Provider activity restarts the pin budget, so background work that keeps// reporting progress (a long Claude workflow) is never cut off; only work- // that went silent for maxIdlePinMs is released. This runs for every- // provider event, so keep it untraced.+ // that went silent for maxIdlePinMs is released. Progress events can be+ // frequent, so keep this untraced.const scheduleIdleReleaseInternal = Effect.fnUntraced(function* (providerSessionId: ProviderSessionId,options?: { readonly providerActivity?: boolean },@@ -1710,6 +1713,10 @@ export const layerWithOptions = (});return {...runtime,+ // Pi replaces its session snapshot as metadata changes.+ get providerSession() {+ return runtime.providerSession;+ },subscribeEvents,events: Stream.unwrap(subscribeEvents.pipe(Effect.map((subscription) => subscription.events)),@@ -1942,6 +1949,7 @@ export const layerWithOptions = (const startEventPump = (entry: LiveSessionEntry) => {let stoppedByProvider = false;+ let lastSessionStatus = entry.runtime.providerSession.status;return entry.runtime.events.pipe(Stream.runForEach((event) => {if (shutdownSignal.received) return Effect.void;@@ -1958,11 +1966,13 @@ export const layerWithOptions = (itemId: event.turnItem.id,}): Effect.void;- if (+ // Metadata can change while idle without extending the runtime's lifetime.+ const metadataOnly =event.type === "provider_session.updated" &&- event.providerSession.status === "stopped"- ) {- stoppedByProvider = true;+ event.providerSession.status === lastSessionStatus;+ if (event.type === "provider_session.updated") {+ lastSessionStatus = event.providerSession.status;+ if (lastSessionStatus === "stopped") stoppedByProvider = true;}return observeActivity(entry.runtime.providerSessionId,@@ -1972,7 +1982,9 @@ export const layerWithOptions = (event.providerThreadId,event.runOrdinal,)- : touchActivity(entry.runtime.providerSessionId, { providerActivity: true }),+ : metadataOnly+ ? Effect.void+ : touchActivity(entry.runtime.providerSessionId, { providerActivity: true }),).pipe(Effect.andThen(event.type === "provider_session.updated"diff --git a/apps/server/src/storageCleanup.test.ts b/apps/server/src/storageCleanup.test.tsindex b4c9ac3e689..b551b026014 100644--- a/apps/server/src/storageCleanup.test.ts+++ b/apps/server/src/storageCleanup.test.ts@@ -7,6 +7,7 @@ import * as Fiber from "effect/Fiber";import * as FileSystem from "effect/FileSystem";import * as Layer from "effect/Layer";import * as Option from "effect/Option";+import * as Queue from "effect/Queue";import type * as Path from "effect/Path";import type * as Scope from "effect/Scope";import * as Stream from "effect/Stream";@@ -345,6 +346,7 @@ const cleanupFixture = (let editBeforeRemoval = false;let openSessionCwd: string | null = null;let sessionLive = true;+ let sessionLiveChecks = 0;let onLiveCheck: Effect.Effect<void> = Effect.void;let outboxStatus: string | null = null;let fullStatusCalls = 0;@@ -416,7 +418,10 @@ const cleanupFixture = (} as unknown as ProjectionStore.ProjectionStoreV2["Service"]),Effect.provideService(ProviderSessionManager.ProviderSessionManagerV2, {isLive: () =>- Effect.sync(() => sessionLive).pipe(Effect.tap(() => Effect.suspend(() => onLiveCheck))),+ Effect.sync(() => {+ sessionLiveChecks++;+ return sessionLive;+ }).pipe(Effect.tap(() => Effect.suspend(() => onLiveCheck))),} as unknown as ProviderSessionManager.ProviderSessionManagerV2["Service"]),Effect.provideService(Orchestrator.OrchestratorV2, {streamDomainEvents: Stream.suspend(() => events),@@ -551,6 +556,7 @@ const cleanupFixture = (}) ?? Effect.void,fullStatusCalls: () => fullStatusCalls,snapshotReads: () => snapshotReads,+ sessionLiveChecks: () => sessionLiveChecks,activate: (domainEvents: Stream.Stream<OrchestrationV2DomainEvent>) => {events = domainEvents;return Deferred.succeed(activated, undefined);@@ -1897,6 +1903,106 @@ describe("orphan worktree reports", () => {});describe("storage cleanup reports and local file policies", () => {+ it.effect.each([true, false])(+ "sweeps on runtime retirement rather than live error metadata, worktreeOnDelete=%s",+ (worktreeOnDelete) =>+ runCleanupTest(+ Effect.gen(function* () {+ const fixture = yield* cleanupFixture({+ ...DEFAULT_SERVER_SETTINGS.storageCleanup,+ worktreeAfterDays: 8,+ worktreeOnDelete,+ });+ fixture.setThreads([]);+ fixture.setDeletedThreads([+ shell({ branch: "feature", worktreePath: fixture.worktree, deletedAt: at(0) }),+ ]);+ yield* fixture.fs.writeFileString(`${fixture.worktree}/tracked.txt`, "agent edit\n");+ const events = yield* Queue.unbounded<{+ readonly event: OrchestrationV2DomainEvent;+ readonly processed: Deferred.Deferred<void>;+ }>();+ yield* fixture.activate(+ Stream.fromQueue(events).pipe(+ Stream.flatMap(({ event, processed }) =>+ Stream.succeed(event).pipe(+ Stream.concat(+ // The next pull acknowledges that the listener handled this event.+ Stream.fromEffect(Deferred.succeed(processed, undefined)).pipe(Stream.drain),+ ),+ ),+ ),+ ),+ );+ yield* fixture.service.reports.pipe(+ Stream.filter((report) => report !== null),+ Stream.take(1),+ Stream.runDrain,+ );+ yield* fixture.service.drain;+ const startupReads = fixture.snapshotReads();+ const publish = Effect.fn("StorageCleanupTest.publish")(function* (+ event: OrchestrationV2DomainEvent,+ ) {+ const processed = yield* Deferred.make<void>();+ yield* Queue.offer(events, { event, processed });+ yield* Deferred.await(processed);+ yield* fixture.service.drain;+ });+ const sessionUpdated = (+ status: "ready" | "error" | "stopped",+ text: string,+ ): OrchestrationV2DomainEvent => ({+ id: EventId.make(`event:session:${status}:${text}`),+ type: "provider-session.updated",+ threadId: ThreadId.make("thread-1"),+ occurredAt: at(0),+ payload: {+ id: ProviderSessionId.make("session-1"),+ driver: ProviderDriverKind.make("pi"),+ providerInstanceId: ProviderInstanceId.make("pi"),+ status,+ cwd: fixture.worktree,+ model: null,+ capabilities: CodexProviderCapabilitiesV2,+ extensionStatuses: text === "" ? [] : [{ key: "watch", text }],+ createdAt: at(-DAY_MS),+ updatedAt: at(0),+ lastError: status === "error" ? "Rate limited" : null,+ },+ });+ yield* publish(sessionUpdated("ready", "Watching"));+ expect(fixture.snapshotReads()).toBe(startupReads);+ expect(fixture.sessionLiveChecks()).toBe(0);+ for (let index = 0; index < 5; index++) {+ yield* publish(sessionUpdated("error", `Watching ${index} files`));+ expect(fixture.snapshotReads()).toBe(startupReads);+ }+ expect(fixture.sessionLiveChecks()).toBe(worktreeOnDelete ? 5 : 0);++ // Release removes the live entry before publishing its final error update.+ fixture.setSessionLive(false);+ yield* publish(sessionUpdated("error", ""));+ expect(fixture.snapshotReads()).toBe(startupReads + Number(worktreeOnDelete));+ expect(fixture.sessionLiveChecks()).toBe(worktreeOnDelete ? 6 : 0);++ yield* publish(sessionUpdated("stopped", ""));+ expect(fixture.snapshotReads()).toBe(startupReads + 2 * Number(worktreeOnDelete));+ expect(fixture.sessionLiveChecks()).toBe(worktreeOnDelete ? 6 : 0);++ fixture.setSessionLive(true);+ yield* publish({+ id: EventId.make("event:thread:deleted"),+ type: "thread.deleted",+ threadId: ThreadId.make("thread-1"),+ occurredAt: at(0),+ payload: { ...shell({ deletedAt: at(0) }), lastVisitedAt: null },+ });+ expect(fixture.snapshotReads()).toBe(startupReads + 3 * Number(worktreeOnDelete));+ expect(fixture.sessionLiveChecks()).toBe(worktreeOnDelete ? 6 : 0);+ }),+ ),+ );it.effect("automatically removes an eligible archived thread checkout", () =>runCleanupTest(Effect.gen(function* () {diff --git a/apps/server/src/storageCleanup.ts b/apps/server/src/storageCleanup.tsindex 6ce9fce4a50..5328f4cfaea 100644--- a/apps/server/src/storageCleanup.ts+++ b/apps/server/src/storageCleanup.ts@@ -1446,9 +1446,12 @@ const make = Effect.gen(function* () {)return Effect.void;}- return anyWorktreePolicy(lastSettings, (rules) => rules.worktreeOnDelete)- ? requestSweep- : Effect.void;+ if (!anyWorktreePolicy(lastSettings, (rules) => rules.worktreeOnDelete)) return Effect.void;+ return event.type === "provider-session.updated" && event.payload.status === "error"+ ? providerSessions+ .isLive(event.payload.id)+ .pipe(Effect.flatMap((live) => (live ? Effect.void : requestSweep)))+ : requestSweep;}).pipe(Effect.catchCause((cause) =>Effect.logWarning("Storage cleanup event stream failed", { cause }),diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsxindex d49030e6f88..251c0c63603 100644--- a/apps/web/src/components/ChatView.tsx+++ b/apps/web/src/components/ChatView.tsx@@ -75,6 +75,7 @@ import {} from "@t3tools/contracts";import {deriveProviderSubagentStatus,+ deriveProviderExtensionStatuses,deriveReportedModelSelection,deriveResumableRunId,formatModelSelectionEffort,@@ -358,7 +359,7 @@ import { ThreadVisitWatermark } from "./chat/ThreadVisitWatermark";import { ChatTerminalDrawers } from "./chat/ChatTerminalDrawers";import { ChatRightPanel } from "./chat/ChatRightPanel";import { useDraftEnvironmentRouting } from "./chat/useDraftEnvironmentRouting";-import { branchMismatchBannerItem } from "./chat/ThreadActivityBanners";+import { branchMismatchBannerItem, extensionStatusBannerItem } from "./chat/ThreadActivityBanners";import { ThreadNow } from "./chat/ThreadNow";import type { ThreadStructure } from "@t3tools/client-runtime/state/shell";import { useDelayedStatus } from "../hooks/useDelayedStatus";@@ -2619,6 +2620,10 @@ export default function ChatView(props: ChatViewProps) {]: [];const limitRecoveryItems = limitRecoveryBanner === null ? [] : [limitRecoveryBanner];+ const extensionStatusBanner = extensionStatusBannerItem(+ deriveProviderExtensionStatuses(serverProjection),+ );+ const extensionStatusItems = extensionStatusBanner === null ? [] : [extensionStatusBanner];const usageLimitsItems = usageLimitsBanner === null ? [] : [usageLimitsBanner];const projectCloneItems = projectCloneBannerItem === null ? [] : [projectCloneBannerItem];// An approval's feedback goes to that approval; the armed session waits for the next message.@@ -2631,6 +2636,7 @@ export default function ChatView(props: ChatViewProps) {...feedbackBannerItems,...fallbackItems,...limitRecoveryItems,+ ...extensionStatusItems,...usageLimitsItems,...projectCloneItems,...freshSessionItems,@@ -2641,6 +2647,7 @@ export default function ChatView(props: ChatViewProps) {...feedbackBannerItems,...fallbackItems,...limitRecoveryItems,+ ...extensionStatusItems,...usageLimitsItems,...projectCloneItems,...freshSessionItems,diff --git a/apps/web/src/components/chat/ThreadActivityBanners.tsx b/apps/web/src/components/chat/ThreadActivityBanners.tsxindex 368931833dc..434094f954a 100644--- a/apps/web/src/components/chat/ThreadActivityBanners.tsx+++ b/apps/web/src/components/chat/ThreadActivityBanners.tsx@@ -2,6 +2,7 @@ import type {EnvironmentId,OrchestrationV2PendingBackgroundTask,OrchestrationV2ProviderGoal,+ OrchestrationV2ProviderSession,ThreadId,} from "@t3tools/contracts";import type { EnvironmentThreadShell, ThreadStructure } from "@t3tools/client-runtime/state/shell";@@ -31,6 +32,18 @@ import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";import type { ComposerBannerStackItem } from "./ComposerBannerStack";import type { ThreadNowItem } from "./ThreadNow";+export function extensionStatusBannerItem(+ statuses: NonNullable<OrchestrationV2ProviderSession["extensionStatuses"]>,+): ComposerBannerStackItem | null {+ if (statuses.length === 0) return null;+ return {+ id: "pi-extension-status",+ variant: "default",+ icon: <span>▸</span>,+ title: <output>{`Pi · ${statuses.map((status) => status.text).join(" · ")}`}</output>,+ };+}+/** Subagents and side chats waiting on the user, unless the parent is itself waiting on them. */export function childInputNowItem(input: {readonly childThreadInputs: ReadonlyArray<EnvironmentThreadShell>;diff --git a/docs/user/providers-pi.md b/docs/user/providers-pi.mdindex 37026d50ab7..92f984b0b74 100644--- a/docs/user/providers-pi.md+++ b/docs/user/providers-pi.md@@ -49,8 +49,8 @@ loads for the current workspace; selecting one uses Pi's native skill expansion.Pi loads its normal user extensions, and project extensions once the folder is trusted in Pi.Blocking `select`, `confirm`, `input`, and `editor` dialogs work in T3 Code. Notifications appear in-the work log. Pi terminal decoration such as titles, status lines, and widgets does not have a T3-Code equivalent.+the work log. Extensions can publish status text near the composer. Terminal titles and generic+widgets do not have a T3 Code equivalent.## Permission Modesdiff --git a/packages/client-runtime/src/state/threadExecution.test.ts b/packages/client-runtime/src/state/threadExecution.test.tsindex fd03b06b320..fd9f1c4de8c 100644--- a/packages/client-runtime/src/state/threadExecution.test.ts+++ b/packages/client-runtime/src/state/threadExecution.test.ts@@ -23,6 +23,7 @@ import {deriveReportedModelSelection,deriveLatestThreadRun,deriveProviderSubagentStatus,+ deriveProviderExtensionStatuses,deriveResumableRunId,deriveRunlessWorkStartedAt,deriveThreadActivityRun,@@ -58,6 +59,77 @@ function run(id: string, ordinal: number, status: OrchestrationV2RunStatus) {}describe("thread execution presentation", () => {+ it("shows extension statuses only from the selected provider's current live session", () => {+ const instanceId = v2Projection.thread.modelSelection.instanceId;+ const providerThreadId = ProviderThreadId.make("native-status-thread");+ const sessionId = ProviderSessionId.make("native-status-session");+ const statuses = [{ key: "watch", text: "Watching" }];+ const projection = {+ thread: { ...v2Projection.thread, activeProviderThreadId: providerThreadId },+ providerThreads: [+ { id: providerThreadId, providerSessionId: sessionId, providerInstanceId: instanceId },+ ],+ providerSessions: [+ {+ id: sessionId,+ providerInstanceId: instanceId,+ status: "ready" as const,+ extensionStatuses: statuses,+ },+ ],+ };+ expect(deriveProviderExtensionStatuses(projection)).toEqual(statuses);+ expect(+ deriveProviderExtensionStatuses({+ ...projection,+ providerSessions: [+ ...projection.providerSessions,+ {+ ...projection.providerSessions[0]!,+ id: ProviderSessionId.make("unrelated"),+ extensionStatuses: [{ key: "wrong", text: "Wrong session" }],+ },+ ],+ }),+ ).toEqual(statuses);+ expect(+ deriveProviderExtensionStatuses({+ ...projection,+ providerSessions: [{ ...projection.providerSessions[0]!, status: "stopped" }],+ }),+ ).toEqual([]);+ expect(+ deriveProviderExtensionStatuses({+ ...projection,+ providerSessions: [{ ...projection.providerSessions[0]!, status: "error" }],+ }),+ ).toEqual(statuses);+ expect(+ deriveProviderExtensionStatuses({+ ...projection,+ providerSessions: [+ { ...projection.providerSessions[0]!, status: "error", extensionStatuses: [] },+ ],+ }),+ ).toEqual([]);+ expect(+ deriveProviderExtensionStatuses({+ ...projection,+ providerSessions: [{ ...projection.providerSessions[0]!, extensionStatuses: undefined }],+ }),+ ).toEqual([]);+ expect(+ deriveProviderExtensionStatuses({+ ...projection,+ thread: {+ ...projection.thread,+ modelSelection: { instanceId: ProviderInstanceId.make("other"), model: "default" },+ },+ }),+ ).toEqual([]);+ expect(deriveProviderExtensionStatuses(null)).toEqual([]);+ });+it("derives the current root failure without inheriting errors from children or previous runs", () => {const failed = { ...run("limited", 1, "failed"), rootNodeId: NodeId.make("root") };const item = {diff --git a/packages/client-runtime/src/state/threadExecution.ts b/packages/client-runtime/src/state/threadExecution.tsindex 6b260d7224c..44600ffa259 100644--- a/packages/client-runtime/src/state/threadExecution.ts+++ b/packages/client-runtime/src/state/threadExecution.ts@@ -13,6 +13,7 @@ import {type OrchestrationV2NotificationSource,type OrchestrationV2PendingBackgroundTask,type OrchestrationV2ProviderGoal,+ type OrchestrationV2ProviderSession,type ServerProvider,type ServerProviderModel,type OrchestrationV2ExecutionNode,@@ -50,6 +51,45 @@ import { formatSubagentDisplayTitle } from "./subagentDisplay.ts";const ACTIVITY_RUN_STATUSES = new Set(["preparing", "starting", "running", "waiting"]);const INTERRUPTIBLE_RUN_STATUSES = new Set(["preparing", "starting", "running"]);+const EMPTY_EXTENSION_STATUSES: NonNullable<OrchestrationV2ProviderSession["extensionStatuses"]> =+ [];++/** Only the selected provider's current session can supply transient extension status. */+export function deriveProviderExtensionStatuses(+ projection:+ | (Pick<ThreadStructure, "thread"> & {+ readonly providerThreads: ReadonlyArray<+ Pick<+ ThreadStructure["providerThreads"][number],+ "id" | "providerSessionId" | "providerInstanceId"+ >+ >;+ readonly providerSessions: ReadonlyArray<+ Pick<+ OrchestrationV2ProviderSession,+ "id" | "providerInstanceId" | "status" | "extensionStatuses"+ >+ >;+ })+ | null,+) {+ if (projection === null) return EMPTY_EXTENSION_STATUSES;+ const instanceId = projection.thread.modelSelection.instanceId;+ const activeThread = projection.providerThreads.find(+ (thread) => thread.id === projection.thread.activeProviderThreadId,+ );+ if (activeThread !== undefined && activeThread.providerInstanceId !== instanceId)+ return EMPTY_EXTENSION_STATUSES;+ const session = projection.providerSessions.findLast(+ (session) =>+ session.providerInstanceId === instanceId &&+ (activeThread === undefined || session.id === activeThread.providerSessionId),+ );+ return session === undefined || session.status === "stopped"+ ? EMPTY_EXTENSION_STATUSES+ : (session.extensionStatuses ?? EMPTY_EXTENSION_STATUSES);+}+function latestMatchingRun(projection: ThreadStructure,predicate: (run: OrchestrationV2ThreadProjection["runs"][number]) => boolean,diff --git a/packages/contracts/src/orchestrationV2.ts b/packages/contracts/src/orchestrationV2.tsindex 6e70cc66a72..82348643495 100644--- a/packages/contracts/src/orchestrationV2.ts+++ b/packages/contracts/src/orchestrationV2.ts@@ -953,6 +953,14 @@ export const OrchestrationV2ProviderSession = Schema.Struct({cwd: TrimmedNonEmptyString,model: Schema.NullOr(TrimmedNonEmptyString),capabilities: OrchestrationV2ProviderCapabilities,+ extensionStatuses: Schema.optional(+ Schema.Array(+ Schema.Struct({+ key: Schema.String.check(Schema.isMinLength(1), Schema.isMaxLength(256)),+ text: TrimmedNonEmptyString.check(Schema.isMaxLength(4096)),+ }),+ ).check(Schema.isMaxLength(32)),+ ).pipe(Schema.withDecodingDefault(Effect.succeed([]))),createdAt: Schema.DateTimeUtc,updatedAt: Schema.DateTimeUtc,lastError: Schema.NullOr(Schema.String),diff --git a/packages/provider-pi/src/server/adapter.test.ts b/packages/provider-pi/src/server/adapter.test.tsindex 546169a35b3..87e90e3258f 100644--- a/packages/provider-pi/src/server/adapter.test.ts+++ b/packages/provider-pi/src/server/adapter.test.ts@@ -550,6 +550,419 @@ const startTurn = Effect.fnUntraced(function* (});describe("PiAdapterV2", () => {+ it.effect(+ "replaces keyed extension statuses while idle without producing conversation items",+ () =>+ Effect.gen(function* () {+ const fake = yield* makeFakePi;+ const { runtime, takeEvent } = yield* openRuntime(fake);+ const updates = [+ { statusKey: "watch", statusText: "\u001b[32mWatching 3 files\u001b[0m\u0007" },+ { statusKey: "lint", statusText: "Lint clean" },+ { statusKey: "watch", statusText: "Watching 4 files" },+ { statusKey: "watch", statusText: "Watching 4 files" },+ { statusKey: "watch", statusText: "\u001b[32mWatching 4 files\u001b[0m" },+ { statusKey: "lint", statusText: "" },+ { statusKey: "missing" },+ { statusKey: "watch" },+ { statusKey: "watch", statusText: "Watching 4 files" },+ ];+ for (const update of updates) {+ yield* fake.emit({ type: "extension_ui_request", method: "setStatus", ...update });+ }+ // The following dialog is an observable milestone after the preceding native notifications.+ yield* fake.emit({+ type: "extension_ui_request",+ id: "status-barrier",+ method: "input",+ title: "Continue?",+ });+ const observed: ProviderAdapter.ProviderAdapterV2Event[] = [];+ yield* takeEvent((event) => {+ observed.push(event);+ return event.type === "runtime_request.updated";+ });+ assert.deepInclude(runtime.providerSession, {+ extensionStatuses: [{ key: "watch", text: "Watching 4 files" }],+ });+ const snapshots = observed.filter((event) => event.type === "provider_session.updated");+ assert.lengthOf(snapshots, 6);+ assert.deepInclude(snapshots[0]?.providerSession, {+ extensionStatuses: [{ key: "watch", text: "Watching 3 files" }],+ });+ assert.deepInclude(snapshots[2]?.providerSession, {+ extensionStatuses: [+ { key: "watch", text: "Watching 4 files" },+ { key: "lint", text: "Lint clean" },+ ],+ });+ assert.isFalse(observed.some((event) => event.type === "message.updated"));+ assert.isFalse(+ observed.some(+ (event) =>+ event.type === "turn_item.updated" && event.turnItem.type !== "user_input_request",+ ),+ );+ assert.isFalse(+ fake.allRequests().some((request) => request["type"] === "extension_ui_response"),+ );+ }).pipe(Effect.scoped, Effect.provide(layerTest)),+ );++ it.effect("bounds native extension statuses and lets cleared keys free capacity", () =>+ Effect.gen(function* () {+ const fake = yield* makeFakePi;+ const { runtime, takeEvent } = yield* openRuntime(fake);+ for (let index = 0; index < 35; index++) {+ yield* fake.emit({+ type: "extension_ui_request",+ method: "setStatus",+ statusKey: `key-${index}`,+ statusText: index === 1 ? "w".repeat(20000) : "Watching",+ });+ }+ for (const update of [+ { statusKey: "" },+ { statusKey: "x".repeat(257) },+ { statusKey: "malformed", statusText: null },+ ]) {+ yield* fake.emit({+ type: "extension_ui_request",+ method: "setStatus",+ statusText: "Invalid",+ ...update,+ });+ }+ yield* fake.emit({ type: "extension_ui_request", method: "setStatus", statusKey: "key-0" });+ yield* fake.emit({+ type: "extension_ui_request",+ method: "setStatus",+ statusKey: "replacement",+ statusText: "New status",+ });+ yield* fake.emit({+ type: "extension_ui_request",+ id: "status-barrier",+ method: "input",+ title: "Continue?",+ });+ yield* takeEvent((event) => event.type === "runtime_request.updated");+ const statuses = runtime.providerSession.extensionStatuses ?? [];+ assert.lengthOf(statuses, 32);+ assert.equal(statuses[0]?.key, "key-1");+ assert.equal(statuses[0]?.text.length, 4096);+ assert.deepEqual(statuses.at(-1), { key: "replacement", text: "New status" });+ }).pipe(Effect.scoped, Effect.provide(layerTest)),+ );++ it.effect("publishes extension status while native work awaits adoption", () =>+ Effect.gen(function* () {+ const fake = yield* makeFakePi;+ const offers =+ yield* Queue.unbounded<ProviderContinuationRequests.ProviderContinuationRequest>();+ const { runtime, takeEvent } = yield* openRuntime(+ fake,+ "default",+ THREAD_ID,+ SESSION_ID,+ undefined,+ { offer: (offer) => Queue.offer(offers, offer).pipe(Effect.asVoid) },+ );+ yield* runtime.ensureThread({+ threadId: THREAD_ID,+ modelSelection: modelSelection("default"),+ runtimePolicy,+ });+ yield* fake.emit({ type: "agent_start" });+ yield* Queue.take(offers);+ yield* fake.emit({+ type: "extension_ui_request",+ method: "setStatus",+ statusKey: "watch",+ statusText: "Native wake",+ });+ yield* fake.emit({+ type: "extension_ui_request",+ id: "status-barrier",+ method: "input",+ title: "Continue?",+ });+ yield* takeEvent((event) => event.type === "runtime_request.updated");+ assert.deepEqual(runtime.providerSession.extensionStatuses, [+ { key: "watch", text: "Native wake" },+ ]);+ assert.isTrue(yield* runtime.hasPendingBackgroundWork!);+ }).pipe(Effect.scoped, Effect.provide(layerTest)),+ );++ it.effect(+ "keeps extension status through turn settlement and clears it on native session replacement",+ () =>+ Effect.gen(function* () {+ const fake = yield* makeFakePi;+ const { runtime, takeEvent } = yield* openRuntime(fake);+ const providerThread = yield* runtime.ensureThread({+ threadId: THREAD_ID,+ modelSelection: modelSelection("default"),+ runtimePolicy,+ });+ yield* startTurn(runtime, providerThread);+ yield* fake.takeRequest("prompt");+ yield* fake.emit({+ type: "extension_ui_request",+ method: "setStatus",+ statusKey: "watch",+ statusText: "Watching",+ });+ yield* fake.emit({ type: "agent_settled" });+ yield* takeEvent((event) => event.type === "turn.terminal");+ assert.deepInclude(runtime.providerSession, {+ status: "ready",+ extensionStatuses: [{ key: "watch", text: "Watching" }],+ });+ yield* startTurn(+ runtime,+ providerThread,+ "anthropic/other-model",+ [],+ "Hello again",+ undefined,+ 2,+ );+ assert.deepEqual(runtime.providerSession.extensionStatuses, [+ { key: "watch", text: "Watching" },+ ]);+ yield* fake.emit({ type: "agent_settled" });+ yield* takeEvent((event) => event.type === "turn.terminal");+ yield* runtime.ensureThread({+ threadId: THREAD_ID,+ modelSelection: modelSelection("default"),+ runtimePolicy,+ });+ assert.deepInclude(runtime.providerSession, { extensionStatuses: [] });+ }).pipe(Effect.scoped, Effect.provide(layerTest)),+ );++ it.effect.each(["model error", "rejected prompt", "failed compact"] as const)(+ "keeps extension status through a reusable %s and the next turn",+ (failure) =>+ Effect.gen(function* () {+ const fake = yield* makeFakePi;+ const { runtime, takeEvent } = yield* openRuntime(fake);+ const providerThread = yield* runtime.ensureThread({+ threadId: THREAD_ID,+ modelSelection: modelSelection("default"),+ runtimePolicy,+ });+ yield* fake.emit({+ type: "extension_ui_request",+ method: "setStatus",+ statusKey: "watch",+ statusText: "Watching 3 files",+ });+ const command = failure === "failed compact" ? "compact" : "prompt";+ yield* startTurn(+ runtime,+ providerThread,+ "default",+ [],+ command === "compact" ? "/compact" : "Hello pi",+ );+ yield* fake.takeRequest(command);+ if (failure === "model error") {+ yield* fake.emit({+ type: "message_end",+ message: { role: "assistant", stopReason: "error", errorMessage: "Rate limited" },+ });+ yield* fake.emit({ type: "agent_settled" });+ } else {+ yield* fake.emit({+ type: "response",+ command,+ success: false,+ error: "Request rejected",+ });+ }+ const terminal = yield* takeEvent((event) => event.type === "turn.terminal");+ assert.isTrue(terminal.type === "turn.terminal" && terminal.status === "failed");+ assert.deepInclude(runtime.providerSession, {+ status: "error",+ extensionStatuses: [{ key: "watch", text: "Watching 3 files" }],+ });++ yield* fake.emit({+ type: "extension_ui_request",+ method: "setStatus",+ statusKey: "watch",+ statusText: "Watching 4 files",+ });+ yield* fake.emit({+ type: "extension_ui_request",+ id: "failed-turn-status-barrier",+ method: "input",+ title: "Continue?",+ });+ yield* takeEvent((event) => event.type === "runtime_request.updated");+ assert.deepInclude(runtime.providerSession, {+ status: "error",+ extensionStatuses: [{ key: "watch", text: "Watching 4 files" }],+ });++ yield* startTurn(runtime, providerThread, "default", [], "Hello again", undefined, 2);+ yield* fake.takeRequest("prompt");+ yield* fake.emit({ type: "agent_settled" });+ const nextTerminal = yield* takeEvent((event) => event.type === "turn.terminal");+ assert.isTrue(nextTerminal.type === "turn.terminal" && nextTerminal.status === "completed");+ assert.deepInclude(runtime.providerSession, {+ id: SESSION_ID,+ status: "ready",+ extensionStatuses: [{ key: "watch", text: "Watching 4 files" }],+ });+ }).pipe(Effect.scoped, Effect.provide(layerTest)),+ );++ it.effect("preserves extension statuses when a native session switch is vetoed", () =>+ Effect.gen(function* () {+ const fake = yield* makeFakePi;+ const { runtime, takeEvent } = yield* openRuntime(fake);+ const providerThread = yield* runtime.ensureThread({+ threadId: THREAD_ID,+ modelSelection: modelSelection("default"),+ runtimePolicy,+ });+ yield* fake.emit({+ type: "extension_ui_request",+ method: "setStatus",+ statusKey: "watch",+ statusText: "Watching",+ });+ yield* fake.emit({+ type: "extension_ui_request",+ id: "status-barrier",+ method: "input",+ title: "Continue?",+ });+ yield* takeEvent((event) => event.type === "runtime_request.updated");+ fake.vetoNextSwitch();+ const exit = yield* runtime.resumeThread({ providerThread }).pipe(Effect.exit);+ assert.isTrue(Exit.isFailure(exit));+ assert.deepEqual(runtime.providerSession.extensionStatuses, [+ { key: "watch", text: "Watching" },+ ]);+ }).pipe(Effect.scoped, Effect.provide(layerTest)),+ );++ it.effect.each(["success", "cancelled", "error"] as const)(+ "handles native status publications during session switch hooks, outcome=%s",+ (outcome) =>+ Effect.gen(function* () {+ const fake = yield* makeFakePi;+ const { runtime, takeEvent } = yield* openRuntime(fake);+ const providerThread = yield* runtime.ensureThread({+ threadId: THREAD_ID,+ modelSelection: modelSelection("default"),+ runtimePolicy,+ });+ for (const key of ["watch", "lint"])+ yield* fake.emit({+ type: "extension_ui_request",+ method: "setStatus",+ statusKey: key,+ statusText: key === "lint" ? "Lint clean" : "Watching",+ });+ fake.deferNextLifecycle("switch_session");+ const switching = yield* runtime+ .resumeThread({ providerThread })+ .pipe(Effect.exit, Effect.forkScoped);+ const request = yield* fake.takeRequest("switch_session");+ yield* fake.emit({ type: "extension_ui_request", method: "setStatus", statusKey: "watch" });+ yield* fake.emit({+ type: "extension_ui_request",+ method: "setStatus",+ statusKey: "startup",+ statusText: "Fresh status",+ });+ yield* fake.emit({+ type: "extension_ui_request",+ id: "switch-hook",+ method: "input",+ title: "Continue?",+ });+ yield* takeEvent((event) => event.type === "runtime_request.updated");+ yield* fake.emit({+ type: "response",+ id: request["id"],+ command: "switch_session",+ success: outcome !== "error",+ data: { cancelled: outcome === "cancelled" },+ ...(outcome === "error" ? { error: "Session replacement failed" } : {}),+ });+ const exit = yield* Fiber.join(switching);+ assert.equal(Exit.isFailure(exit), outcome !== "success");+ if (outcome === "error") {+ const reuse = yield* runtime.resumeThread({ providerThread }).pipe(Effect.exit);+ assert.isTrue(Exit.isFailure(reuse));+ yield* takeEvent(+ (event) =>+ event.type === "provider_session.updated" && event.providerSession.status === "error",+ );+ assert.deepEqual(runtime.providerSession.extensionStatuses, []);+ return;+ }+ assert.deepEqual(runtime.providerSession.extensionStatuses, [+ ...(outcome === "cancelled" ? [{ key: "lint", text: "Lint clean" }] : []),+ { key: "startup", text: "Fresh status" },+ ]);+ }).pipe(Effect.scoped, Effect.provide(layerTest)),+ );++ it.effect.each(["stop", "transport death"] as const)(+ "clears extension statuses on %s",+ (retirement) =>+ Effect.gen(function* () {+ const fake = yield* makeFakePi;+ const { runtime, takeEvent } = yield* openRuntime(fake);+ const providerThread = yield* runtime.ensureThread({+ threadId: THREAD_ID,+ modelSelection: modelSelection("default"),+ runtimePolicy,+ });+ yield* startTurn(runtime, providerThread);+ const turnStarted = yield* takeEvent((event) => event.type === "provider_turn.updated");+ assert.equal(turnStarted.type, "provider_turn.updated");+ if (turnStarted.type !== "provider_turn.updated") return;+ yield* fake.emit({+ type: "extension_ui_request",+ method: "setStatus",+ statusKey: "watch",+ statusText: "Watching",+ });+ yield* fake.emit({+ type: "extension_ui_request",+ id: "status-barrier",+ method: "input",+ title: "Continue?",+ });+ yield* takeEvent((event) => event.type === "runtime_request.updated");+ assert.deepInclude(runtime.providerSession, {+ extensionStatuses: [{ key: "watch", text: "Watching" }],+ });+ if (retirement === "stop") {+ yield* runtime.interruptTurn({+ providerThread,+ providerTurnId: turnStarted.providerTurn.id,+ requestRuntimeRestart: true,+ });+ } else yield* fake.closeStdout;+ yield* takeEvent(+ (event) =>+ event.type === "provider_session.updated" &&+ event.providerSession.status === (retirement === "stop" ? "stopped" : "error"),+ );+ assert.deepInclude(runtime.providerSession, { extensionStatuses: [] });+ }).pipe(Effect.scoped, Effect.provide(layerTest)),+ );+it.effect("keeps native image bytes and the saved path in the prompt", () =>Effect.gen(function* () {const host = yield* ProviderHost.ProviderHost;diff --git a/packages/provider-pi/src/server/adapter.ts b/packages/provider-pi/src/server/adapter.tsindex 4f3a6175aa3..d47b693f0e1 100644--- a/packages/provider-pi/src/server/adapter.ts+++ b/packages/provider-pi/src/server/adapter.ts@@ -1,4 +1,5 @@import * as HostProcess from "@t3tools/shared/HostProcess";+import * as NodeUtil from "node:util";import { AgentScope } from "@t3tools/shared/AgentScope";import { getModelSelectionStringOptionValue } from "@t3tools/shared/model";import { readToolOutputImage } from "@t3tools/shared/toolOutput";@@ -82,6 +83,9 @@ const PI_INHERIT_MODEL_SLUG = "default";const STREAM_FLUSH_MS = 50;const PI_REQUEST_TIMEOUT_MS = 15_000;const PI_SESSION_TIMEOUT_MS = 60_000;+const MAX_EXTENSION_STATUSES = 32;+const MAX_EXTENSION_STATUS_KEY_LENGTH = 256;+const MAX_EXTENSION_STATUS_TEXT_LENGTH = 4096;const PI_UNSOLICITED_ACTIVITY_ERROR ="Pi started agent work outside an active T3 turn. The session was stopped to prevent invisible tool execution.";const SETTLE_PROBE_MAX_ATTEMPTS = 3;@@ -521,6 +525,7 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (cwd,model: input.modelSelection.model,capabilities: PiProviderCapabilitiesV2,+ extensionStatuses: [],createdAt: now,updatedAt: now,lastError: null,@@ -538,7 +543,14 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (let lastNativeThreadId: string | null = null;let stopRequested = false;let unsolicitedActivityDetected = false;+ // Turn failures can leave Pi alive; pump termination retires the runtime.+ let runtimeRetired = false;let pendingWake: PiWake | null = null;+ let extensionStatusReset: {+ previous: NonNullable<OrchestrationV2ProviderSession["extensionStatuses"]>;+ readonly touched: Set<string>;+ readonly ready: Deferred.Deferred<void, ProviderAdapter.ProviderAdapterProtocolError>;+ } | null = null;let rollbackBarrier: Deferred.Deferred<void,ProviderAdapter.ProviderAdapterProtocolError@@ -547,7 +559,13 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (yield* Effect.addFinalizer(() =>Effect.gen(function* () {closed = true;+ sessionEntity = { ...sessionEntity, extensionStatuses: [] };pendingWake = null;+ if (extensionStatusReset !== null)+ yield* Deferred.fail(+ extensionStatusReset.ready,+ protocolError("Pi session closed during status reset"),+ );if (rollbackBarrier !== null)yield* Deferred.fail(rollbackBarrier,@@ -609,7 +627,15 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (lastError: string | null = sessionEntity.lastError,) {const updatedAt = yield* DateTime.now;- sessionEntity = { ...sessionEntity, status, lastError, updatedAt };+ sessionEntity = {+ ...sessionEntity,+ status,+ lastError,+ updatedAt,+ ...(status === "stopped" || runtimeRetired || unsolicitedActivityDetected+ ? { extensionStatuses: [] }+ : {}),+ };yield* emit({type: "provider_session.updated",driver: PI_PROVIDER,@@ -617,6 +643,63 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (});});+ // Frequent notifications share the event pump's tracing boundary and outlive individual turns.+ const updateExtensionStatus = Effect.fnUntraced(function* (event: PiRpcRecord) {+ if (+ closed ||+ stopRequested ||+ runtimeRetired ||+ unsolicitedActivityDetected ||+ sessionEntity.status === "stopped"+ )+ return;+ const key = recordString(event, "statusKey");+ const rawText = recordField(event, "statusText");+ if (+ key === undefined ||+ key.trim().length === 0 ||+ key.length > MAX_EXTENSION_STATUS_KEY_LENGTH ||+ (rawText !== undefined && typeof rawText !== "string")+ )+ return;+ const text =+ typeof rawText === "string"+ ? NodeUtil.stripVTControlCharacters(+ rawText.slice(0, MAX_EXTENSION_STATUS_TEXT_LENGTH * 4),+ )+ .replaceAll(/\p{Cc}/gu, " ")+ .trim()+ .slice(0, MAX_EXTENSION_STATUS_TEXT_LENGTH)+ : "";+ const statuses = sessionEntity.extensionStatuses ?? [];+ if (extensionStatusReset?.previous.some((status) => status.key === key)) {+ extensionStatusReset.touched.add(key);+ }+ const index = statuses.findIndex((status) => status.key === key);+ if (+ index < 0+ ? text.length === 0 || statuses.length >= MAX_EXTENSION_STATUSES+ : statuses[index]?.text === text+ )+ return;+ sessionEntity = {+ ...sessionEntity,+ extensionStatuses:+ text.length === 0+ ? statuses.filter((status) => status.key !== key)+ : index < 0+ ? [...statuses, { key, text }]+ : statuses.map((status) => (status.key === key ? { key, text } : status)),+ };+ yield* updateProviderSession(sessionEntity.status);+ });++ const clearExtensionStatuses = Effect.fn("PiAdapter.clearExtensionStatuses")(function* () {+ if (sessionEntity.extensionStatuses?.length === 0) return;+ sessionEntity = { ...sessionEntity, extensionStatuses: [] };+ yield* updateProviderSession(sessionEntity.status);+ });+const updateProviderThread =/* Provider events include streaming deltas; avoid a span for each update. */Effect.fnUntraced(function* (@@ -661,22 +744,81 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (return null;};- const lifecycleRequest = (record: PiRpcRecord) =>- request(record, PI_SESSION_TIMEOUT_MS).pipe(- // Timeout does not cancel Pi's lifecycle hook; retire the process before fallback can race it.- Effect.tapError((error) =>- Effect.logWarning("Pi session lifecycle request failed", {- providerSessionId: input.providerSessionId,- operation: record["type"],- errorTag: error._tag,- }),+ const lifecycleRequest = Effect.fn("PiAdapter.lifecycleRequest")(+ function* (record: PiRpcRecord) {+ if (extensionStatusReset !== null)+ return yield* protocolError("A Pi session lifecycle request is already pending");+ const reset = {+ previous: sessionEntity.extensionStatuses ?? [],+ touched: new Set<string>(),+ ready: yield* Deferred.make<void, ProviderAdapter.ProviderAdapterProtocolError>(),+ };+ extensionStatusReset = reset;+ return yield* Effect.gen(function* () {+ // RPC responses bypass the pump. Reset after all earlier native notifications.+ if (+ !(yield* Queue.offer(connection.events, { type: "t3.extension_status_reset", reset }))+ )+ return yield* protocolError("Pi transport closed during status reset");+ yield* Deferred.await(reset.ready);+ const result = yield* request(record, PI_SESSION_TIMEOUT_MS);+ if (recordField(result, "cancelled") === true) {+ yield* sessionEventPermit.withPermits(1)(+ Effect.gen(function* () {+ if (closed || stopRequested) return;+ const current = sessionEntity.extensionStatuses ?? [];+ // A veto keeps the old session. Preserve updates and clears from its lifecycle hooks.+ const restored = reset.previous.flatMap((status) => {+ if (!reset.touched.has(status.key)) return [status];+ const updated = current.find((candidate) => candidate.key === status.key);+ return updated === undefined ? [] : [updated];+ });+ restored.push(+ ...current.filter(+ (status) => !reset.previous.some((previous) => previous.key === status.key),+ ),+ );+ const statuses = restored.slice(0, MAX_EXTENSION_STATUSES);+ if (+ statuses.length === current.length &&+ statuses.every(+ (status, index) =>+ status.key === current[index]?.key && status.text === current[index]?.text,+ )+ )+ return;+ sessionEntity = { ...sessionEntity, extensionStatuses: statuses };+ yield* updateProviderSession(sessionEntity.status);+ }),+ );+ }+ return result;+ }).pipe(+ Effect.ensuring(+ Effect.sync(() => {+ if (extensionStatusReset === reset) extensionStatusReset = null;+ }),+ ),+ );+ },+ (effect, record) =>+ effect.pipe(+ Effect.tapError((error) =>+ Effect.logWarning("Pi session lifecycle request failed", {+ providerSessionId: input.providerSessionId,+ operation: record["type"],+ errorTag: error._tag,+ }),+ ),+ // A failed lifecycle RPC can leave Pi's previous native session disposed.+ Effect.tapError((error) =>+ error._tag === "PiRpcError" || error._tag === "PiRpcTimeoutError"+ ? connection.terminate+ : Effect.void,+ ),+ Effect.onInterrupt(() => connection.terminate),),- Effect.catchTags({- PiRpcTimeoutError: (error) =>- connection.terminate.pipe(Effect.andThen(Effect.fail(error))),- }),- Effect.onInterrupt(() => connection.terminate),- );+ );const tokenUsageFromStats = (stats: unknown,@@ -1700,6 +1842,21 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (});const handleSessionEvent = Effect.fnUntraced(function* (event: PiRpcRecord) {+ if (event["type"] === "t3.extension_status_reset") {+ const reset = extensionStatusReset;+ if (reset !== null && event["reset"] === reset) {+ reset.previous = sessionEntity.extensionStatuses ?? [];+ reset.touched.clear();+ yield* clearExtensionStatuses();+ yield* Deferred.succeed(reset.ready, undefined);+ }+ return;+ }+ // A native wake may wait for a turn owner; status belongs to the live session immediately.+ if (event["type"] === "extension_ui_request" && event["method"] === "setStatus") {+ yield* updateExtensionStatus(event);+ return;+ }// Model hooks can show dialogs before turn ownership; keep requests session-scoped and buffer output.const interactiveUiRequest =event["type"] === "extension_ui_request" &&@@ -2205,7 +2362,13 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (Effect.catchCause((cause) =>sessionEventPermit.withPermits(1)(Effect.gen(function* () {+ runtimeRetired = true;const state = threadState;+ if (extensionStatusReset !== null)+ yield* Deferred.fail(+ extensionStatusReset.ready,+ protocolError("Pi transport closed during status reset"),+ );if (rollbackBarrier !== null)yield* Deferred.fail(rollbackBarrier,