Skip to content

Commit df0cc36

Browse files
saphidclaudemaria-rcks
authored
fix(pi): usage reports include sessions stored in a --session-dir launch argument (pingdotgg#30690)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
1 parent 02cb2fc commit df0cc36

3 files changed

Lines changed: 73 additions & 9 deletions

File tree

‎apps/server/src/usage/UsageService.test.ts‎

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,11 +1275,27 @@ describe("UsageService", () => {
12751275
it.live("discovers Pi history in its default home and directory overrides", () =>
12761276
Effect.gen(function* () {
12771277
const { home, settings } = yield* setup;
1278-
for (const [agentDir, sessionDir, relativeDir] of [
1279-
[undefined, undefined, ".pi/agent/sessions"],
1280-
["~/custom-pi", undefined, "custom-pi/sessions"],
1281-
["~/ignored-pi", "~/custom-sessions", "custom-sessions"],
1282-
["~/ignored-pi", NodePath.join(home, "absolute-sessions"), "absolute-sessions"],
1278+
for (const [agentDir, sessionDir, relativeDir, launchArgs, instanceHome, platform] of [
1279+
[undefined, undefined, ".pi/agent/sessions", undefined],
1280+
["~/custom-pi", undefined, "custom-pi/sessions", undefined],
1281+
["~/ignored-pi", "~/custom-sessions", "custom-sessions", undefined],
1282+
["~/ignored-pi", NodePath.join(home, "absolute-sessions"), "absolute-sessions", undefined],
1283+
["~/ignored-pi", undefined, "launch-sessions", "--session-dir ~/launch-sessions"],
1284+
[
1285+
"~/ignored-pi",
1286+
undefined,
1287+
"instance-home /launch-sessions",
1288+
"--session-dir ~/launch-sessions",
1289+
"instance-home ",
1290+
],
1291+
[
1292+
"~/ignored-pi",
1293+
undefined,
1294+
"windows-profile/launch-sessions",
1295+
"--session-dir ~/launch-sessions",
1296+
"windows-profile",
1297+
"win32",
1298+
],
12831299
] as const) {
12841300
const dir = NodePath.join(home, relativeDir);
12851301
yield* Effect.promise(async () => {
@@ -1318,11 +1334,34 @@ describe("UsageService", () => {
13181334
layerService({
13191335
prefix: "usage-pi-" + relativeDir.replaceAll("/", "-"),
13201336
home,
1321-
settings,
1337+
settings:
1338+
launchArgs === undefined
1339+
? settings
1340+
: {
1341+
...settings,
1342+
providerInstances: {
1343+
...settings.providerInstances,
1344+
[ProviderInstanceId.make("pi")]: {
1345+
driver: ProviderDriverKind.make("pi"),
1346+
config: { launchArgs },
1347+
environment:
1348+
instanceHome === undefined
1349+
? []
1350+
: [
1351+
{
1352+
name: platform === "win32" ? "USERPROFILE" : "HOME",
1353+
value: NodePath.join(home, instanceHome),
1354+
sensitive: false,
1355+
},
1356+
],
1357+
},
1358+
},
1359+
},
13221360
environment: {
13231361
PI_CODING_AGENT_DIR: agentDir,
13241362
PI_CODING_AGENT_SESSION_DIR: sessionDir,
13251363
},
1364+
platform: platform ?? "linux",
13261365
}),
13271366
),
13281367
Effect.provideService(HostProcess.HomeDirectory, home),

‎packages/provider-pi/src/server/mcpInjection.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const RESERVED_PI_LAUNCH_ARGUMENTS = new Set([
3232
"-v",
3333
]);
3434

35-
const PI_ARGUMENTS_WITH_VALUES = new Set([
35+
export const PI_ARGUMENTS_WITH_VALUES = new Set([
3636
"--api-key",
3737
"--append-system-prompt",
3838
"--exclude-tools",

‎packages/provider-pi/src/server/usage.ts‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
} from "@t3tools/provider-core/server/usage";
1515
import * as HostProcess from "@t3tools/shared/HostProcess";
1616
import type { PiSettings } from "../settings.ts";
17+
import { PI_ARGUMENTS_WITH_VALUES, resolvePiLaunchArgs } from "./mcpInjection.ts";
1718

1819
const PiScanState = Schema.Struct({ sessionId: Schema.mutableKey(Schema.String) });
1920
const Usage = Schema.Struct({
@@ -128,13 +129,37 @@ export const piUsageReader: ProviderUsageReader<PiSettings, Path.Path> = {
128129
kind: "transcripts",
129130
provider: "pi",
130131
format: piUsageFormat,
131-
directories: Effect.fn("piUsageReader.directories")(function* ({ environment }) {
132+
directories: Effect.fn("piUsageReader.directories")(function* ({ config, environment }) {
132133
const path = yield* Path.Path;
133134
const home = yield* HostProcess.HomeDirectory;
134-
return [{ dir: resolvePiSessionsDir(environment, home, path) }];
135+
const platform = yield* HostProcess.Platform;
136+
const launchHome = (platform === "win32" ? environment.USERPROFILE : environment.HOME) || home;
137+
const sessionDirArg = config === undefined ? undefined : piLaunchSessionDir(config.launchArgs);
138+
const launchDir =
139+
sessionDirArg === undefined ? undefined : expandHomePath(sessionDirArg, launchHome);
140+
// --session-dir moves only T3-launched sessions; terminal sessions stay in Pi's own directory.
141+
return [
142+
...(launchDir !== undefined && path.isAbsolute(launchDir)
143+
? [{ dir: path.resolve(launchDir) }]
144+
: []),
145+
{ dir: resolvePiSessionsDir(environment, home, path) },
146+
];
135147
}),
136148
};
137149

150+
function piLaunchSessionDir(launchArgs: string): string | undefined {
151+
const resolved = resolvePiLaunchArgs(launchArgs);
152+
if (!resolved.ok) return undefined;
153+
let sessionDir: string | undefined;
154+
for (let index = 0; index < resolved.args.length; index += 1) {
155+
const arg = resolved.args[index];
156+
if (arg === undefined || !PI_ARGUMENTS_WITH_VALUES.has(arg)) continue;
157+
index += 1;
158+
if (arg === "--session-dir") sessionDir = resolved.args[index] || undefined;
159+
}
160+
return sessionDir;
161+
}
162+
138163
/** Where Pi stores session JSONL files for a provider environment, matching Pi's own lookup. */
139164
export function resolvePiSessionsDir(
140165
environment: NodeJS.ProcessEnv,

0 commit comments

Comments
 (0)