@sebastianandreasson/pi-autonomous-agents 0.14.0 → 0.15.0

package/README.md

@@ -80,7 +80,7 @@ Typical scripts:
 
 Start from [templates/pi.config.example.json](./templates/pi.config.example.json), [templates/DEVELOPER.md](./templates/DEVELOPER.md), [templates/TESTER.md](./templates/TESTER.md), and [templates/gitignore.fragment](./templates/gitignore.fragment).
 
-Request telemetry is enabled by default for SDK runs. `pi-harness` writes a managed Pi extension shim to `.pi/extensions/pi-harness-request-telemetry/index.mjs` in the consuming repo, and Pi auto-discovers it on the next resource reload. Disable that with `PI_REQUEST_TELEMETRY_ENABLED=0` or `"piRequestTelemetryEnabled": false`.
+Request telemetry is enabled by default for SDK runs. `pi-harness` writes a managed Pi extension package under `.pi/extensions/pi-harness-request-telemetry/` in the consuming repo, with a `package.json` manifest and `index.mjs` shim that Pi auto-discovers on the next resource reload. Disable that with `PI_REQUEST_TELEMETRY_ENABLED=0` or `"piRequestTelemetryEnabled": false`.
 
 ## CLI
 

package/docs/PI_REQUEST_TELEMETRY_EXTENSION.md

@@ -2,7 +2,7 @@
 
 This document describes the repo-local Pi extension prototype under [pi-extensions/request-telemetry](../pi-extensions/request-telemetry/README.md).
 
-In normal `pi-harness` SDK runs, this extension is auto-enabled by installing a managed shim under `.pi/extensions/pi-harness-request-telemetry/` in the consuming repo before Pi reloads resources. Opt out with `PI_REQUEST_TELEMETRY_ENABLED=0` or `"piRequestTelemetryEnabled": false`.
+In normal `pi-harness` SDK runs, this extension is auto-enabled by installing a managed extension package under `.pi/extensions/pi-harness-request-telemetry/` in the consuming repo before Pi reloads resources. That package contains a `package.json` Pi manifest plus the generated `index.mjs` shim. Opt out with `PI_REQUEST_TELEMETRY_ENABLED=0` or `"piRequestTelemetryEnabled": false`.
 
 The purpose of this extension is to gather request-level data directly from Pi extension hooks before we decide whether to patch `@mariozechner/pi-coding-agent` or `pi-ai`.
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sebastianandreasson/pi-autonomous-agents",
   "private": false,
-  "version": "0.14.0",
+  "version": "0.15.0",
   "type": "module",
   "description": "Portable unattended PI harness for developer/tester/visual-review loops.",
   "license": "MIT",

package/pi-extensions/request-telemetry/index.mjs

@@ -9,6 +9,7 @@ import {
   extractMessagesFromProviderPayload,
   extractUsageFromMessage,
   getRequestTelemetryPaths,
+  readRequestTelemetryContextFromEnv,
   summarizeProviderPayload,
   summarizeRequestSpans,
 } from '../../src/pi-request-telemetry.mjs'
@@ -51,10 +52,16 @@ function createTurnState({ turnIndex = 0, startedAt = '', model = '' } = {}) {
   }
 }
 
-function createRequestState({ sessionId, turnIndex = 0, startedAt, model = '' } = {}) {
+function createRequestState({ sessionId, turnIndex = 0, startedAt, model = '', metadata = {} } = {}) {
   return {
     requestId: randomUUID(),
     sessionId,
+    runId: String(metadata?.runId ?? '').trim(),
+    iteration: Number(metadata?.iteration ?? 0) || 0,
+    phase: String(metadata?.phase ?? '').trim(),
+    role: String(metadata?.role ?? '').trim(),
+    kind: String(metadata?.kind ?? '').trim(),
+    task: String(metadata?.task ?? '').trim(),
     turnIndex,
     startedAt,
     finishedAt: '',
@@ -277,6 +284,7 @@ export function createRequestTelemetryExtension({ cwd = process.cwd() } = {}) {
       turnIndex: currentTurn.turnIndex,
       startedAt: new Date().toISOString(),
       model: state.currentModel || currentTurn.model,
+      metadata: readRequestTelemetryContextFromEnv(),
       ...overrides,
     })
   }
@@ -307,7 +315,13 @@ export function createRequestTelemetryExtension({ cwd = process.cwd() } = {}) {
       request: {
         timestamp: requestState.finishedAt,
         requestId: requestState.requestId,
+        runId: requestState.runId,
         sessionId: requestState.sessionId,
+        iteration: requestState.iteration,
+        phase: requestState.phase,
+        role: requestState.role,
+        kind: requestState.kind,
+        task: requestState.task,
         turnIndex: requestState.turnIndex,
         startedAt: requestState.startedAt,
         finishedAt: requestState.finishedAt,

package/src/index.mjs

@@ -33,8 +33,11 @@ export {
   collectProviderPayloadSpans,
   createEmptyRequestTelemetryBreakdown,
   createEmptyRequestUsage,
+  deriveRequestTelemetryAnalytics,
   deriveRequestTelemetryBreakdown,
   deriveToolPaths,
+  readRequestTelemetryContextFromEnv,
+  readRequestTelemetryRecords,
   extractMessagesFromProviderPayload,
   extractUsageFromMessage,
   ensureBundledRequestTelemetryExtension,

package/src/pi-client.mjs

@@ -209,7 +209,7 @@ async function runMockTurn({ config, sessionId, sessionFile, prompt, reason }) {
   }
 }
 
-async function runSdkTransportTurn({ config, model, sessionId, sessionFile, prompt, iteration, retryCount, reason, phase, role, kind }) {
+async function runSdkTransportTurn({ config, model, sessionId, sessionFile, prompt, iteration, retryCount, reason, phase, role, kind, task }) {
   await appendLog(
     config.logFile,
     `Starting SDK turn iteration=${iteration} retry=${retryCount} reason=${reason}`
@@ -253,6 +253,7 @@ async function runSdkTransportTurn({ config, model, sessionId, sessionFile, prom
       phase,
       role,
       kind,
+      task,
       onLiveEvent: (event) => appendLiveFeedEvent(config, event),
     })
   } catch (error) {

package/src/pi-request-telemetry.mjs

@@ -4,6 +4,14 @@ import { fileURLToPath, pathToFileURL } from 'node:url'
 
 export const REQUEST_TELEMETRY_SCHEMA_VERSION = 1
 export const REQUEST_TELEMETRY_EXTENSION_DIRNAME = 'pi-harness-request-telemetry'
+export const REQUEST_TELEMETRY_ENV_KEYS = Object.freeze({
+  runId: 'PI_REQUEST_RUN_ID',
+  iteration: 'PI_REQUEST_ITERATION',
+  phase: 'PI_REQUEST_PHASE',
+  role: 'PI_REQUEST_ROLE',
+  kind: 'PI_REQUEST_KIND',
+  task: 'PI_REQUEST_TASK',
+})
 
 const scriptDir = path.dirname(fileURLToPath(import.meta.url))
 const packageRoot = path.resolve(scriptDir, '..')
@@ -147,6 +155,7 @@ function createEmptyBreakdownShape(mode = 'request_telemetry') {
       eventCount: 0,
       requestCount: 0,
       spanCount: 0,
+      runId: '',
       sessionId: '',
     },
     totals: {
@@ -176,6 +185,21 @@ function createEmptyBreakdownShape(mode = 'request_telemetry') {
   }
 }
 
+function createEmptyAnalyticsShape() {
+  return {
+    schemaVersion: REQUEST_TELEMETRY_SCHEMA_VERSION,
+    generatedAt: '',
+    source: {
+      mode: 'request_telemetry',
+      requestCount: 0,
+      runId: '',
+      sessionId: '',
+    },
+    timeline: [],
+    todos: [],
+  }
+}
+
 function parseJsonLikeString(value) {
   if (typeof value !== 'string') {
     return value
@@ -205,6 +229,35 @@ function parseJsonLikeString(value) {
   }
 }
 
+function filterRequestsForScope(requests, { runId = '', sessionId = '' } = {}) {
+  const normalizedRequests = (Array.isArray(requests) ? requests : []).map((request) => normalizeRequestTelemetryRecord(request))
+  const requestedRunId = normalizeString(runId, '')
+  const requestedSessionId = normalizeString(sessionId, '')
+  const latestRequest = [...normalizedRequests]
+    .sort((left, right) => String(right.timestamp).localeCompare(String(left.timestamp)))[0]
+
+  const selectedRunId = requestedRunId !== '' && normalizedRequests.some((request) => request.runId === requestedRunId)
+    ? requestedRunId
+    : normalizeString(latestRequest?.runId, '')
+  const selectedSessionId = selectedRunId === '' && requestedSessionId !== '' && normalizedRequests.some((request) => request.sessionId === requestedSessionId)
+    ? requestedSessionId
+    : selectedRunId === ''
+      ? normalizeString(latestRequest?.sessionId, '')
+      : ''
+
+  const filteredRequests = selectedRunId !== ''
+    ? normalizedRequests.filter((request) => request.runId === selectedRunId)
+    : selectedSessionId === ''
+      ? normalizedRequests
+      : normalizedRequests.filter((request) => request.sessionId === selectedSessionId)
+
+  return {
+    filteredRequests,
+    selectedRunId,
+    selectedSessionId,
+  }
+}
+
 export function createEmptyRequestUsage() {
   return {
     inputTokens: 0,
@@ -215,6 +268,17 @@ export function createEmptyRequestUsage() {
   }
 }
 
+export function readRequestTelemetryContextFromEnv(env = process.env) {
+  return {
+    runId: normalizeString(env?.[REQUEST_TELEMETRY_ENV_KEYS.runId], ''),
+    iteration: toFiniteNumber(env?.[REQUEST_TELEMETRY_ENV_KEYS.iteration]),
+    phase: normalizeString(env?.[REQUEST_TELEMETRY_ENV_KEYS.phase], ''),
+    role: normalizeString(env?.[REQUEST_TELEMETRY_ENV_KEYS.role], ''),
+    kind: normalizeString(env?.[REQUEST_TELEMETRY_ENV_KEYS.kind], ''),
+    task: normalizeString(env?.[REQUEST_TELEMETRY_ENV_KEYS.task], ''),
+  }
+}
+
 export function normalizeRequestUsage(value) {
   if (!value || typeof value !== 'object') {
     return createEmptyRequestUsage()
@@ -712,7 +776,13 @@ export function normalizeRequestTelemetryRecord(record) {
     schemaVersion: REQUEST_TELEMETRY_SCHEMA_VERSION,
     timestamp: isoFromValue(record?.timestamp),
     requestId: normalizeString(record?.requestId, ''),
+    runId: normalizeString(record?.runId, ''),
     sessionId: normalizeString(record?.sessionId, ''),
+    iteration: toFiniteNumber(record?.iteration),
+    phase: normalizeString(record?.phase, ''),
+    role: normalizeString(record?.role, ''),
+    kind: normalizeString(record?.kind, ''),
+    task: normalizeString(record?.task, ''),
     turnIndex: toFiniteNumber(record?.turnIndex),
     startedAt: normalizeString(record?.startedAt, ''),
     finishedAt: normalizeString(record?.finishedAt, ''),
@@ -761,6 +831,7 @@ export function getManagedRequestTelemetryExtensionPaths({ cwd } = {}) {
     extensionRoot,
     extensionDir,
     entryFile: path.join(extensionDir, 'index.mjs'),
+    manifestFile: path.join(extensionDir, 'package.json'),
     sourceFile: bundledRequestTelemetryExtensionFile,
   }
 }
@@ -775,6 +846,17 @@ function renderRequestTelemetryExtensionShim(sourceFile) {
   ].join('\n')
 }
 
+function renderRequestTelemetryExtensionManifest() {
+  return `${JSON.stringify({
+    name: REQUEST_TELEMETRY_EXTENSION_DIRNAME,
+    private: true,
+    type: 'module',
+    pi: {
+      extensions: ['./index.mjs'],
+    },
+  }, null, 2)}\n`
+}
+
 export async function ensureBundledRequestTelemetryExtension({ cwd, enabled = true } = {}) {
   const paths = getManagedRequestTelemetryExtensionPaths({ cwd })
 
@@ -792,15 +874,23 @@ export async function ensureBundledRequestTelemetryExtension({ cwd, enabled = tr
   await fs.access(paths.sourceFile)
   await fs.mkdir(paths.extensionDir, { recursive: true })
 
-  const content = renderRequestTelemetryExtensionShim(paths.sourceFile)
-  let existing = ''
+  const entryContent = renderRequestTelemetryExtensionShim(paths.sourceFile)
+  const manifestContent = renderRequestTelemetryExtensionManifest()
+  let existingEntry = ''
+  let existingManifest = ''
   try {
-    existing = await fs.readFile(paths.entryFile, 'utf8')
+    existingEntry = await fs.readFile(paths.entryFile, 'utf8')
+  } catch {}
+  try {
+    existingManifest = await fs.readFile(paths.manifestFile, 'utf8')
   } catch {}
 
-  const updated = existing !== content
-  if (updated) {
-    await fs.writeFile(paths.entryFile, content, 'utf8')
+  const updated = existingEntry !== entryContent || existingManifest !== manifestContent
+  if (existingEntry !== entryContent) {
+    await fs.writeFile(paths.entryFile, entryContent, 'utf8')
+  }
+  if (existingManifest !== manifestContent) {
+    await fs.writeFile(paths.manifestFile, manifestContent, 'utf8')
   }
 
   return {
@@ -888,7 +978,7 @@ export async function appendRequestTelemetryArtifacts(paths, { request, spans =
   }
 }
 
-export function deriveRequestTelemetryBreakdown({ requests = [], spans = [], sessionId = '' } = {}) {
+export function deriveRequestTelemetryBreakdown({ requests = [], spans = [], sessionId = '', runId = '' } = {}) {
   const empty = createEmptyRequestTelemetryBreakdown()
   const normalizedRequests = (Array.isArray(requests) ? requests : [])
     .map((request) => normalizeRequestTelemetryRecord(request))
@@ -897,16 +987,10 @@ export function deriveRequestTelemetryBreakdown({ requests = [], spans = [], ses
     return empty
   }
 
-  const requestedSessionId = normalizeString(sessionId, '')
-  const latestRequest = [...normalizedRequests]
-    .sort((left, right) => String(right.timestamp).localeCompare(String(left.timestamp)))[0]
-  const selectedSessionId = requestedSessionId !== '' && normalizedRequests.some((request) => request.sessionId === requestedSessionId)
-    ? requestedSessionId
-    : normalizeString(latestRequest?.sessionId, '')
-
-  const filteredRequests = selectedSessionId === ''
-    ? normalizedRequests
-    : normalizedRequests.filter((request) => request.sessionId === selectedSessionId)
+  const { filteredRequests, selectedRunId, selectedSessionId } = filterRequestsForScope(normalizedRequests, {
+    runId,
+    sessionId,
+  })
   const requestIds = new Set(filteredRequests.map((request) => request.requestId))
   const filteredSpans = (Array.isArray(spans) ? spans : [])
     .map((span) => normalizeRequestSpanRecord(span))
@@ -921,6 +1005,9 @@ export function deriveRequestTelemetryBreakdown({ requests = [], spans = [], ses
 
   const totals = { ...empty.totals }
   const byAttribution = createBucketMap()
+  const byKind = createBucketMap()
+  const byRole = createBucketMap()
+  const byPhase = createBucketMap()
   const byModel = createBucketMap()
   const bySession = createBucketMap()
   const byTool = createBucketMap()
@@ -946,6 +1033,9 @@ export function deriveRequestTelemetryBreakdown({ requests = [], spans = [], ses
     totals.eventCount += 1
 
     addUsageToBucket(byAttribution, request.spanSource, request.spanSource, exactUsage, 1)
+    addUsageToBucket(byKind, request.kind, request.kind, exactUsage, 1)
+    addUsageToBucket(byRole, request.role, request.role, exactUsage, 1)
+    addUsageToBucket(byPhase, request.phase, request.phase, exactUsage, 1)
     addUsageToBucket(byModel, request.model, request.model, exactUsage, 1)
     addUsageToBucket(bySession, request.sessionId, request.sessionId, exactUsage, 1)
 
@@ -1030,6 +1120,7 @@ export function deriveRequestTelemetryBreakdown({ requests = [], spans = [], ses
       eventCount: filteredRequests.length,
       requestCount: filteredRequests.length,
       spanCount: filteredSpans.length,
+      runId: selectedRunId,
       sessionId: selectedSessionId,
     },
     totals: {
@@ -1046,9 +1137,9 @@ export function deriveRequestTelemetryBreakdown({ requests = [], spans = [], ses
       fileAttributionRatio: totalInputContextTokens > 0 ? fileAttributedTokens / totalInputContextTokens : 0,
     },
     breakdowns: {
-      byKind: [],
-      byRole: [],
-      byPhase: [],
+      byKind: finalizeBucketMap(byKind),
+      byRole: finalizeBucketMap(byRole),
+      byPhase: finalizeBucketMap(byPhase),
       byModel: finalizeBucketMap(byModel),
       bySession: finalizeBucketMap(bySession),
       byAttribution: finalizeBucketMap(byAttribution),
@@ -1059,11 +1150,168 @@ export function deriveRequestTelemetryBreakdown({ requests = [], spans = [], ses
   }
 }
 
-export async function readRequestTelemetryBreakdown({ cwd, sessionId = '', baseDir } = {}) {
+function formatTimelineLabel(timestamp) {
+  const date = new Date(timestamp)
+  if (!Number.isFinite(date.getTime())) {
+    return ''
+  }
+  return date.toLocaleTimeString([], {
+    hour: '2-digit',
+    minute: '2-digit',
+  })
+}
+
+function summarizeTodoRequests(requests, iterationSummary) {
+  const sorted = [...requests].sort((left, right) => String(left.timestamp).localeCompare(String(right.timestamp)))
+  const firstRequest = sorted[0]
+  const lastRequest = sorted.at(-1)
+  const task = sorted.find((request) => request.task !== '')?.task || iterationSummary?.task || `Iteration ${firstRequest?.iteration ?? 0}`
+  const phase = sorted.find((request) => request.phase !== '')?.phase || iterationSummary?.phase || ''
+  const roleSet = new Set(sorted.map((request) => request.role).filter(Boolean))
+  const kindSet = new Set(sorted.map((request) => request.kind).filter(Boolean))
+
+  return {
+    key: `iteration-${firstRequest?.iteration ?? 0}`,
+    iteration: Number(firstRequest?.iteration ?? 0),
+    phase,
+    task,
+    status: String(iterationSummary?.status ?? ''),
+    requestCount: sorted.length,
+    firstTimestamp: String(firstRequest?.timestamp ?? ''),
+    lastTimestamp: String(lastRequest?.timestamp ?? ''),
+    roles: [...roleSet],
+    kinds: [...kindSet],
+    inputTokens: sorted.reduce((sum, request) => sum + request.inputTokens, 0),
+    outputTokens: sorted.reduce((sum, request) => sum + request.outputTokens, 0),
+    totalTokens: sorted.reduce((sum, request) => sum + request.totalTokens, 0),
+    cacheReadTokens: sorted.reduce((sum, request) => sum + request.cacheReadTokens, 0),
+    cacheWriteTokens: sorted.reduce((sum, request) => sum + request.cacheWriteTokens, 0),
+  }
+}
+
+export function deriveRequestTelemetryAnalytics({ requests = [], telemetry = [], runId = '', sessionId = '' } = {}) {
+  const empty = createEmptyAnalyticsShape()
+  const normalizedRequests = (Array.isArray(requests) ? requests : [])
+    .map((request) => normalizeRequestTelemetryRecord(request))
+
+  if (normalizedRequests.length === 0) {
+    return empty
+  }
+
+  const { filteredRequests, selectedRunId, selectedSessionId } = filterRequestsForScope(normalizedRequests, {
+    runId,
+    sessionId,
+  })
+
+  if (filteredRequests.length === 0) {
+    return empty
+  }
+
+  const sortedRequests = [...filteredRequests].sort((left, right) => String(left.timestamp).localeCompare(String(right.timestamp)))
+  const timeline = []
+
+  if (sortedRequests.length <= 36) {
+    for (const request of sortedRequests) {
+      timeline.push({
+        key: request.requestId,
+        timestamp: request.timestamp,
+        label: formatTimelineLabel(request.timestamp),
+        requestCount: 1,
+        inputTokens: request.inputTokens,
+        outputTokens: request.outputTokens,
+        totalTokens: request.totalTokens,
+        cacheReadTokens: request.cacheReadTokens,
+        cacheWriteTokens: request.cacheWriteTokens,
+      })
+    }
+  } else {
+    const startedAt = new Date(sortedRequests[0].timestamp).getTime()
+    const finishedAt = new Date(sortedRequests.at(-1)?.timestamp ?? sortedRequests[0].timestamp).getTime()
+    const bucketCount = 36
+    const bucketMs = Math.max(1, Math.ceil((finishedAt - startedAt + 1) / bucketCount))
+    const buckets = new Map()
+
+    for (const request of sortedRequests) {
+      const bucketIndex = Math.max(0, Math.min(bucketCount - 1, Math.floor((new Date(request.timestamp).getTime() - startedAt) / bucketMs)))
+      const bucketStart = new Date(startedAt + (bucketIndex * bucketMs)).toISOString()
+      const current = buckets.get(bucketIndex) ?? {
+        key: `bucket-${bucketIndex}`,
+        timestamp: bucketStart,
+        label: formatTimelineLabel(bucketStart),
+        requestCount: 0,
+        inputTokens: 0,
+        outputTokens: 0,
+        totalTokens: 0,
+        cacheReadTokens: 0,
+        cacheWriteTokens: 0,
+      }
+      current.requestCount += 1
+      current.inputTokens += request.inputTokens
+      current.outputTokens += request.outputTokens
+      current.totalTokens += request.totalTokens
+      current.cacheReadTokens += request.cacheReadTokens
+      current.cacheWriteTokens += request.cacheWriteTokens
+      buckets.set(bucketIndex, current)
+    }
+
+    timeline.push(...[...buckets.entries()]
+      .sort((left, right) => left[0] - right[0])
+      .map(([, bucket]) => bucket))
+  }
+
+  const iterationSummaries = new Map()
+  for (const event of Array.isArray(telemetry) ? telemetry : []) {
+    if (String(event?.kind ?? '') !== 'iteration_summary') {
+      continue
+    }
+    iterationSummaries.set(Number(event?.iteration ?? 0), {
+      iteration: Number(event?.iteration ?? 0),
+      phase: String(event?.phase ?? ''),
+      status: String(event?.status ?? ''),
+      timestamp: String(event?.timestamp ?? ''),
+    })
+  }
+
+  const requestsByIteration = new Map()
+  for (const request of sortedRequests) {
+    const iteration = Number(request.iteration ?? 0)
+    if (!Number.isFinite(iteration) || iteration <= 0) {
+      continue
+    }
+    const existing = requestsByIteration.get(iteration) ?? []
+    existing.push(request)
+    requestsByIteration.set(iteration, existing)
+  }
+
+  const todos = [...requestsByIteration.entries()]
+    .map(([iteration, iterationRequests]) => summarizeTodoRequests(iterationRequests, iterationSummaries.get(iteration)))
+    .filter((todo) => todo.status === 'success')
+    .sort((left, right) => right.iteration - left.iteration)
+
+  return {
+    schemaVersion: REQUEST_TELEMETRY_SCHEMA_VERSION,
+    generatedAt: now(),
+    source: {
+      mode: 'request_telemetry',
+      requestCount: sortedRequests.length,
+      runId: selectedRunId,
+      sessionId: selectedSessionId,
+    },
+    timeline,
+    todos,
+  }
+}
+
+export async function readRequestTelemetryRecords({ cwd, baseDir } = {}) {
   const paths = getRequestTelemetryPaths({ cwd, baseDir })
   const [requests, spans] = await Promise.all([
     readJsonlRecords(paths.requestsFile, normalizeRequestTelemetryRecord),
     readJsonlRecords(paths.spansFile, normalizeRequestSpanRecord),
   ])
-  return deriveRequestTelemetryBreakdown({ requests, spans, sessionId })
+  return { requests, spans }
+}
+
+export async function readRequestTelemetryBreakdown({ cwd, sessionId = '', runId = '', baseDir } = {}) {
+  const { requests, spans } = await readRequestTelemetryRecords({ cwd, baseDir })
+  return deriveRequestTelemetryBreakdown({ requests, spans, sessionId, runId })
 }

package/src/pi-sdk-turn.mjs

@@ -13,7 +13,11 @@ import {
   normalizeStringList,
   normalizeTokenUsage,
 } from './pi-token-analysis.mjs'
-import { ensureBundledRequestTelemetryExtension } from './pi-request-telemetry.mjs'
+import {
+  REQUEST_TELEMETRY_ENV_KEYS,
+  ensureBundledRequestTelemetryExtension,
+  readRequestTelemetryContextFromEnv,
+} from './pi-request-telemetry.mjs'
 
 const THINKING_LEVELS = new Set(['off', 'minimal', 'low', 'medium', 'high', 'xhigh'])
 
@@ -117,6 +121,39 @@ function addTokenUsage(total, value) {
   }
 }
 
+function applyRequestTelemetryEnv(request) {
+  const previous = readRequestTelemetryContextFromEnv()
+  const nextValues = {
+    [REQUEST_TELEMETRY_ENV_KEYS.runId]: String(process.env.PI_RUN_ID ?? '').trim(),
+    [REQUEST_TELEMETRY_ENV_KEYS.iteration]: Number.isFinite(Number(request?.metadata?.iteration))
+      ? String(Number(request.metadata.iteration))
+      : '',
+    [REQUEST_TELEMETRY_ENV_KEYS.phase]: String(request?.phase ?? '').trim(),
+    [REQUEST_TELEMETRY_ENV_KEYS.role]: String(request?.role ?? '').trim(),
+    [REQUEST_TELEMETRY_ENV_KEYS.kind]: String(request?.kind ?? '').trim(),
+    [REQUEST_TELEMETRY_ENV_KEYS.task]: String(request?.task ?? '').trim(),
+  }
+
+  for (const [key, value] of Object.entries(nextValues)) {
+    if (value === '') {
+      delete process.env[key]
+      continue
+    }
+    process.env[key] = value
+  }
+
+  return () => {
+    for (const [field, key] of Object.entries(REQUEST_TELEMETRY_ENV_KEYS)) {
+      const previousValue = String(previous?.[field] ?? '').trim()
+      if (previousValue === '') {
+        delete process.env[key]
+        continue
+      }
+      process.env[key] = previousValue
+    }
+  }
+}
+
 function deriveTokenAttributionKind({ activeToolName, pendingToolNames, pendingFiles, lastAssistantActivity }) {
   if (String(activeToolName ?? '').trim() !== '') {
     return 'tool_running'
@@ -404,6 +441,7 @@ async function safeAbort(session) {
 }
 
 export async function runSdkTurnWithPi(pi, request) {
+  const restoreRequestTelemetryEnv = applyRequestTelemetryEnv(request)
   const streamTerminal = request.streamTerminal === true
   const requestedModel = typeof request.model === 'string' ? request.model : ''
   const loopRepeatThreshold = Number.isFinite(Number(request.loopRepeatThreshold))
@@ -833,6 +871,7 @@ export async function runSdkTurnWithPi(pi, request) {
       terminalReason,
     }
   } finally {
+    restoreRequestTelemetryEnv()
     unsubscribe()
     if (heartbeatInterval) {
       clearInterval(heartbeatInterval)

package/src/pi-supervisor.mjs

@@ -574,6 +574,7 @@ async function runAgentInvocation({
   config,
   iteration,
   phase,
+  task,
   prompt,
   role,
   kind,
@@ -614,6 +615,7 @@ async function runAgentInvocation({
     retryCount,
     reason,
     phase,
+    task,
     role,
     kind,
   })
@@ -993,7 +995,7 @@ async function runVerificationStep({
   }
 }
 
-async function runMainTurnWithRetries({ config, state, iteration, phase, sessionId, sessionFile }) {
+async function runMainTurnWithRetries({ config, state, iteration, phase, task, sessionId, sessionFile }) {
   let currentSessionId = sessionId
   let currentSessionFile = sessionFile
   let loopHistory = pruneLoopHistory(state?.loopHistory, {
@@ -1012,6 +1014,7 @@ async function runMainTurnWithRetries({ config, state, iteration, phase, session
       config,
       iteration,
       phase,
+      task,
       prompt,
       role: attempt === 0 ? 'developer' : 'developerRetry',
       kind: 'main_agent',
@@ -1108,7 +1111,7 @@ async function runMainTurnWithRetries({ config, state, iteration, phase, session
   throw new Error('Retry loop exited unexpectedly.')
 }
 
-async function runFixTurn({ config, state, iteration, phase, sessionId, sessionFile, testerOutput }) {
+async function runFixTurn({ config, state, iteration, phase, task, sessionId, sessionFile, testerOutput }) {
   const largeFileWarnings = findLargeFileWarnings(config, listChangedFiles(config.cwd))
   const fixPrompt = buildFixPrompt(
     config,
@@ -1124,6 +1127,7 @@ async function runFixTurn({ config, state, iteration, phase, sessionId, sessionF
     config,
     iteration,
     phase,
+    task,
     prompt: fixPrompt,
     role: 'developerFix',
     kind: 'fix_agent',
@@ -1139,6 +1143,7 @@ async function runDeveloperVerificationAndFix({
   state,
   iteration,
   phase,
+  task,
   sessionId,
   sessionFile,
   noteParts,
@@ -1179,6 +1184,7 @@ async function runDeveloperVerificationAndFix({
       state,
       iteration,
       phase,
+      task,
       sessionId,
       sessionFile,
       testerOutput: `[developer_verification]\n${verification.output}`,
@@ -1243,6 +1249,7 @@ async function runTesterTurn({
     config,
     iteration,
     phase,
+    task,
     prompt,
     role: 'tester',
     kind: 'tester_agent',
@@ -1339,6 +1346,7 @@ async function runTesterCommitTurn({
     config,
     iteration,
     phase,
+    task,
     prompt,
     role: 'testerCommit',
     kind: 'tester_commit',
@@ -1736,6 +1744,7 @@ async function runIteration({ config, state, iteration }) {
     state,
     iteration,
     phase,
+    task,
     sessionId: startingSessionId,
     sessionFile: startingSessionFile,
   })
@@ -1766,6 +1775,7 @@ async function runIteration({ config, state, iteration }) {
       },
       iteration,
       phase,
+      task,
       sessionId,
       sessionFile,
       noteParts,
@@ -1925,6 +1935,7 @@ async function runIteration({ config, state, iteration }) {
         },
         iteration,
         phase,
+        task,
         sessionId,
         sessionFile,
         testerOutput: compactNotePartsForPrompt(config, noteParts),