TypeScript
fix(pi): usage reports include sessions stored in a --session-dir launch argument (#30690)
Alex Southwelldf0cc36dea0c
diff --git a/apps/server/src/usage/UsageService.test.ts b/apps/server/src/usage/UsageService.test.tsindex c33b6da64a7..31d7fbbda0a 100644--- a/apps/server/src/usage/UsageService.test.ts+++ b/apps/server/src/usage/UsageService.test.ts@@ -1275,11 +1275,27 @@ describe("UsageService", () => {it.live("discovers Pi history in its default home and directory overrides", () =>Effect.gen(function* () {const { home, settings } = yield* setup;- for (const [agentDir, sessionDir, relativeDir] of [- [undefined, undefined, ".pi/agent/sessions"],- ["~/custom-pi", undefined, "custom-pi/sessions"],- ["~/ignored-pi", "~/custom-sessions", "custom-sessions"],- ["~/ignored-pi", NodePath.join(home, "absolute-sessions"), "absolute-sessions"],+ for (const [agentDir, sessionDir, relativeDir, launchArgs, instanceHome, platform] of [+ [undefined, undefined, ".pi/agent/sessions", undefined],+ ["~/custom-pi", undefined, "custom-pi/sessions", undefined],+ ["~/ignored-pi", "~/custom-sessions", "custom-sessions", undefined],+ ["~/ignored-pi", NodePath.join(home, "absolute-sessions"), "absolute-sessions", undefined],+ ["~/ignored-pi", undefined, "launch-sessions", "--session-dir ~/launch-sessions"],+ [+ "~/ignored-pi",+ undefined,+ "instance-home /launch-sessions",+ "--session-dir ~/launch-sessions",+ "instance-home ",+ ],+ [+ "~/ignored-pi",+ undefined,+ "windows-profile/launch-sessions",+ "--session-dir ~/launch-sessions",+ "windows-profile",+ "win32",+ ],] as const) {const dir = NodePath.join(home, relativeDir);yield* Effect.promise(async () => {@@ -1318,11 +1334,34 @@ describe("UsageService", () => {layerService({prefix: "usage-pi-" + relativeDir.replaceAll("/", "-"),home,- settings,+ settings:+ launchArgs === undefined+ ? settings+ : {+ ...settings,+ providerInstances: {+ ...settings.providerInstances,+ [ProviderInstanceId.make("pi")]: {+ driver: ProviderDriverKind.make("pi"),+ config: { launchArgs },+ environment:+ instanceHome === undefined+ ? []+ : [+ {+ name: platform === "win32" ? "USERPROFILE" : "HOME",+ value: NodePath.join(home, instanceHome),+ sensitive: false,+ },+ ],+ },+ },+ },environment: {PI_CODING_AGENT_DIR: agentDir,PI_CODING_AGENT_SESSION_DIR: sessionDir,},+ platform: platform ?? "linux",}),),Effect.provideService(HostProcess.HomeDirectory, home),diff --git a/packages/provider-pi/src/server/mcpInjection.ts b/packages/provider-pi/src/server/mcpInjection.tsindex ab92ab73dde..d88cdeb434c 100644--- a/packages/provider-pi/src/server/mcpInjection.ts+++ b/packages/provider-pi/src/server/mcpInjection.ts@@ -32,7 +32,7 @@ const RESERVED_PI_LAUNCH_ARGUMENTS = new Set(["-v",]);-const PI_ARGUMENTS_WITH_VALUES = new Set([+export const PI_ARGUMENTS_WITH_VALUES = new Set(["--api-key","--append-system-prompt","--exclude-tools",diff --git a/packages/provider-pi/src/server/usage.ts b/packages/provider-pi/src/server/usage.tsindex 961a73e838a..408042a7e48 100644--- a/packages/provider-pi/src/server/usage.ts+++ b/packages/provider-pi/src/server/usage.ts@@ -14,6 +14,7 @@ import {} from "@t3tools/provider-core/server/usage";import * as HostProcess from "@t3tools/shared/HostProcess";import type { PiSettings } from "../settings.ts";+import { PI_ARGUMENTS_WITH_VALUES, resolvePiLaunchArgs } from "./mcpInjection.ts";const PiScanState = Schema.Struct({ sessionId: Schema.mutableKey(Schema.String) });const Usage = Schema.Struct({@@ -128,13 +129,37 @@ export const piUsageReader: ProviderUsageReader<PiSettings, Path.Path> = {kind: "transcripts",provider: "pi",format: piUsageFormat,- directories: Effect.fn("piUsageReader.directories")(function* ({ environment }) {+ directories: Effect.fn("piUsageReader.directories")(function* ({ config, environment }) {const path = yield* Path.Path;const home = yield* HostProcess.HomeDirectory;- return [{ dir: resolvePiSessionsDir(environment, home, path) }];+ const platform = yield* HostProcess.Platform;+ const launchHome = (platform === "win32" ? environment.USERPROFILE : environment.HOME) || home;+ const sessionDirArg = config === undefined ? undefined : piLaunchSessionDir(config.launchArgs);+ const launchDir =+ sessionDirArg === undefined ? undefined : expandHomePath(sessionDirArg, launchHome);+ // --session-dir moves only T3-launched sessions; terminal sessions stay in Pi's own directory.+ return [+ ...(launchDir !== undefined && path.isAbsolute(launchDir)+ ? [{ dir: path.resolve(launchDir) }]+ : []),+ { dir: resolvePiSessionsDir(environment, home, path) },+ ];}),};+function piLaunchSessionDir(launchArgs: string): string | undefined {+ const resolved = resolvePiLaunchArgs(launchArgs);+ if (!resolved.ok) return undefined;+ let sessionDir: string | undefined;+ for (let index = 0; index < resolved.args.length; index += 1) {+ const arg = resolved.args[index];+ if (arg === undefined || !PI_ARGUMENTS_WITH_VALUES.has(arg)) continue;+ index += 1;+ if (arg === "--session-dir") sessionDir = resolved.args[index] || undefined;+ }+ return sessionDir;+}+/** Where Pi stores session JSONL files for a provider environment, matching Pi's own lookup. */export function resolvePiSessionsDir(environment: NodeJS.ProcessEnv,