Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/server/src/project/AgentSessionImporter.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import {
} from "../orchestration-v2/testkit/fixtures/shared.ts";
import * as ProviderSessionRuntime from "../persistence/ProviderSessionRuntime.ts";
import * as SqlitePersistence from "../persistence/Sqlite.ts";
import * as SecretResolverTestkit from "../secrets/SecretResolver.testkit.ts";
import * as ServerSettings from "../serverSettings.ts";
import * as AgentSessionImporter from "./AgentSessionImporter.ts";
import * as AgentSessionScanner from "./AgentSessionScanner.ts";
Expand Down Expand Up @@ -1027,6 +1028,7 @@ it.effect("repeated imports reach linked-worktree sessions behind the scan budge
},
},
}),
SecretResolverTestkit.layerTest(),
Layer.mock(ProjectStore.ProjectStoreV2)({ listShells: () => Effect.succeed([]) }),
Layer.succeed(
ProviderSessionRuntime.ProviderSessionRuntimeRepository,
Expand Down
109 changes: 109 additions & 0 deletions apps/server/src/project/AgentSessionScanner.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import {
type OrchestrationProjectShell,
ProjectId,
ProviderDriverKind,
type ProviderInstanceConfig,
ProviderInstanceId,
SecretProviderId,
type ServerSettings as ContractServerSettings,
ThreadId,
} from "@t3tools/contracts";
Expand All @@ -34,6 +36,7 @@ import * as ServerConfig from "../config.ts";
import * as ProcessRunner from "../processRunner.ts";
import * as ProjectStore from "../orchestration-v2/ProjectStore.ts";
import * as ProviderSessionRuntime from "../persistence/ProviderSessionRuntime.ts";
import * as SecretResolverTestkit from "../secrets/SecretResolver.testkit.ts";
import * as ServerSettings from "../serverSettings.ts";
import * as AgentSessionScanner from "./AgentSessionScanner.ts";

Expand Down Expand Up @@ -67,6 +70,7 @@ interface ScannerTestInput {
readonly sources: ReadonlyArray<AgentSessionImportSource>;
};
readonly processRunner?: Layer.Layer<ProcessRunner.ProcessRunner>;
readonly readSecrets?: Parameters<typeof SecretResolverTestkit.layerTest>[0];
}

const layerRuntimeRepository = (imported: ScannerTestInput["importedTranscripts"]) =>
Expand Down Expand Up @@ -131,6 +135,7 @@ const layerScannerTest = (input: ScannerTestInput) =>
),
layerProjectStore(input.importedWorkspaceRoots ?? []),
layerRuntimeRepository(input.importedTranscripts),
SecretResolverTestkit.layerTest(input.readSecrets),
),
),
);
Expand Down Expand Up @@ -817,6 +822,110 @@ it.layer(NodeServices.layer)("AgentSessionScanner", (it) => {
}),
);

describe("secret-backed history directory", () => {
const secretHome = { provider: SecretProviderId.make("vault"), reference: "kv/codex#home" };
const unrelated = { provider: SecretProviderId.make("vault"), reference: "kv/codex#key" };
const scanCodexSecretHome = (
readSecrets: (home: string) => Parameters<typeof SecretResolverTestkit.layerTest>[0],
extraEnvironment: (home: string) => NonNullable<ProviderInstanceConfig["environment"]>,
config: (home: string) => Record<string, unknown> = () => ({}),
) =>
Effect.gen(function* () {
const path = yield* Path.Path;
const claudeHomePath = yield* makeTempDir("t3code-claude-legacy-");
const codexHomePath = yield* makeTempDir("t3code-codex-legacy-");
const secretCodexHome = yield* makeTempDir("t3code-codex-secret-");
const codexWorkspace = yield* makeTempDir("t3code-workspace-codex-secret-");
yield* writeTranscript({
filePath: path.join(
secretCodexHome,
"sessions",
"2026",
"01",
"01",
"rollout-session.jsonl",
),
contents: codexRolloutLine(codexWorkspace),
mtimeMs: Date.parse("2026-01-02T00:00:00.000Z"),
});
const result = yield* runScan({
claudeHomePath,
codexHomePath,
readSecrets: readSecrets(secretCodexHome),
providerInstances: {
[ProviderInstanceId.make("codex")]: {
driver: ProviderDriverKind.make("codex"),
environment: [
{ name: "CODEX_HOME", value: secretHome, sensitive: true },
...extraEnvironment(secretCodexHome),
],
config: config(secretCodexHome),
},
},
});
return { result, codexWorkspace };
});

it.effect("scans the directory a secret names", () =>
Effect.gen(function* () {
const { result, codexWorkspace } = yield* scanCodexSecretHome(
(home) => (references) => references.map(() => home),
() => [],
);
expect(result.candidates.map((candidate) => candidate.path)).toEqual([codexWorkspace]);
}),
);

it.effect(
"skips the instance instead of scanning the default home when it is unreadable",
() =>
Effect.gen(function* () {
const { result } = yield* scanCodexSecretHome(
() => (references) => references.map(() => undefined),
() => [],
);
expect(result.candidates).toEqual([]);
}),
);

it.effect("scans a configured home path when the environment home secret is unreadable", () =>
Effect.gen(function* () {
const { result, codexWorkspace } = yield* scanCodexSecretHome(
() => (references) => references.map(() => undefined),
() => [],
(home) => ({ homePath: home }),
);
expect(result.candidates.map((candidate) => candidate.path)).toEqual([codexWorkspace]);
}),
);

it.effect("lets a later configured home row win over an earlier secret one", () =>
Effect.gen(function* () {
const { result, codexWorkspace } = yield* scanCodexSecretHome(
() => (references) => references.map(() => "/nonexistent-codex-home"),
(home) => [{ name: "CODEX_HOME", value: home, sensitive: false }],
);
expect(result.candidates.map((candidate) => candidate.path)).toEqual([codexWorkspace]);
}),
);

it.effect("does not skip an instance over a secret unrelated to its history directory", () =>
Effect.gen(function* () {
const { result, codexWorkspace } = yield* scanCodexSecretHome(
(home) => (references) =>
references.map((reference) =>
reference.reference === secretHome.reference ? home : undefined,
),
() => [
{ name: "OPENAI_API_KEY", value: unrelated, sensitive: true },
{ name: "CLAUDE_CONFIG_DIR", value: unrelated, sensitive: true },
],
);
expect(result.candidates.map((candidate) => candidate.path)).toEqual([codexWorkspace]);
}),
);
});

it.effect("honors provider instance home directory environment variables", () =>
Effect.gen(function* () {
const path = yield* Path.Path;
Expand Down
72 changes: 49 additions & 23 deletions apps/server/src/project/AgentSessionScanner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,14 @@ import * as ServerConfig from "../config.ts";
import * as ProcessRunner from "../processRunner.ts";
import * as ProjectStore from "../orchestration-v2/ProjectStore.ts";
import * as ProviderSessionRuntime from "../persistence/ProviderSessionRuntime.ts";
import { claudeUsageReader } from "../provider/Drivers/claudeUsage.ts";
import { resolveCodexHomeLayout } from "../provider/Drivers/CodexHomeLayout.ts";
import { codexUsageReader } from "../provider/Drivers/codexUsage.ts";
import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
import { resolveProviderEnvironmentSecrets } from "../secrets/providerEnvironmentSecrets.ts";
import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
import { piHome, resolvePiSessionsDir } from "@t3tools/provider-pi/server/usage";
import { piHome, piUsageReader, resolvePiSessionsDir } from "@t3tools/provider-pi/server/usage";
import * as ServerSettings from "../serverSettings.ts";
import { sourceControlDefinitions } from "../sourceControl/sourceControlDefinitions.ts";
import {
Expand Down Expand Up @@ -921,6 +925,7 @@ export const make = Effect.gen(function* () {
const platform = yield* HostProcess.Platform;
const isWindows = platform === "win32";
const foldWorktreeCase = isWindows;
const secrets = yield* SecretResolver.SecretResolver;
const hostEnvironment = yield* HostProcess.Environment;
const homeDir = yield* HostProcess.HomeDirectory;
// `/private/tmp` is what macOS reports for sessions started in `/tmp`.
Expand Down Expand Up @@ -1826,45 +1831,66 @@ export const make = Effect.gen(function* () {
const homes: Array<{ homePath: string; providerInstanceId: ProviderInstanceId }> = [];
const seenHomes = new Set<string>();
for (const { instanceId, config: instance } of instances) {
const claudeConfig =
source === "claudeAgent" ? decodeClaudeSettings(instance.config ?? {}) : Option.none();
const codexConfig =
source === "codex" ? decodeCodexSettings(instance.config ?? {}) : Option.none();
if (source === "claudeAgent" && Option.isNone(claudeConfig)) continue;
if (source === "codex" && Option.isNone(codexConfig)) continue;
const historyEnvironment = Option.isSome(claudeConfig)
? claudeUsageReader.historyEnvironment?.(claudeConfig.value)
: Option.isSome(codexConfig)
? codexUsageReader.historyEnvironment?.(codexConfig.value)
: piUsageReader.historyEnvironment?.(undefined);
const providerSecrets = yield* resolveProviderEnvironmentSecrets(
secrets,
instance.environment,
historyEnvironment ?? [],
);
// A history directory held in an unreadable secret would fall back to the host default,
// so the scan would show or import another account's sessions as this instance's.
if (providerSecrets.unreadable.length > 0) {
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
yield* Effect.logWarning(
"skipping a provider instance whose history directory secret could not be read",
{ instanceId, unreadable: providerSecrets.unreadable },
);
continue;
}
const environmentHome = (name: "CLAUDE_CONFIG_DIR" | "CODEX_HOME") => {
const configured = instance.environment?.findLast(
const configured = providerSecrets.environment.findLast(
(variable) => variable.name === name,
)?.value;
return typeof configured === "string" ? configured : hostEnvironment[name];
};

let homePath: string;
if (source === "pi") {
const environment = yield* mergeProviderInstanceEnvironment(
instance.environment,
hostEnvironment,
).pipe(Effect.provideService(HostProcess.HomeDirectory, homeDir));
homePath = resolvePiSessionsDir(
environment,
piHome(environment, homeDir, platform),
path,
);
} else if (source === "claudeAgent") {
const config = decodeClaudeSettings(instance.config ?? {});
if (Option.isNone(config)) continue;
if (Option.isSome(claudeConfig)) {
homePath = resolveClaudeConfigDir(
config.value.homePath,
claudeConfig.value.homePath,
environmentHome("CLAUDE_CONFIG_DIR"),
);
} else {
const config = decodeCodexSettings(instance.config ?? {});
if (Option.isNone(config)) continue;
} else if (Option.isSome(codexConfig)) {
const codexHome = environmentHome("CODEX_HOME");
const codexSettings =
config.value.homePath.trim().length === 0 &&
config.value.shadowHomePath.trim().length === 0 &&
codexConfig.value.homePath.trim().length === 0 &&
codexConfig.value.shadowHomePath.trim().length === 0 &&
codexHome?.trim()
? { ...config.value, homePath: codexHome }
: config.value;
? { ...codexConfig.value, homePath: codexHome }
: codexConfig.value;
const layout = yield* resolveCodexHomeLayout(codexSettings).pipe(
Effect.provideService(Path.Path, path),
);
homePath = layout.sharedHomePath;
} else {
const environment = yield* mergeProviderInstanceEnvironment(
providerSecrets.environment,
hostEnvironment,
).pipe(Effect.provideService(HostProcess.HomeDirectory, homeDir));
homePath = resolvePiSessionsDir(
environment,
piHome(environment, homeDir, platform),
path,
);
}

const homeKey = `${source}\0${yield* directoryIdentity(homePath)}`;
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/provider/Drivers/AntigravityUsage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ export const antigravityUsageReader: ProviderUsageReader<AntigravitySettings, An
kind: "scan",
provider: "antigravity",
rateModel: antigravityRateModel,
historyEnvironment: () => ["ANTIGRAVITY_DATA_DIR"],
scan: ({ instances, windowStartMs }) =>
AntigravityUsage.pipe(Effect.flatMap((usage) => usage.scan({ instances, windowStartMs }))),
};
2 changes: 2 additions & 0 deletions apps/server/src/provider/Drivers/claudeUsage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ export const claudeUsageReader: ProviderUsageReader<ClaudeSettings, Path.Path> =
kind: "transcripts",
provider: "claude",
format: claudeUsageFormat,
historyEnvironment: (config) =>
config === undefined || config.homePath.trim() ? [] : ["CLAUDE_CONFIG_DIR"],
directories: Effect.fn("claudeUsageReader.directories")(function* ({ config, environment }) {
if (config === undefined) return [];
const path = yield* Path.Path;
Expand Down
4 changes: 4 additions & 0 deletions apps/server/src/provider/Drivers/codexUsage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,10 @@ export const codexUsageReader: ProviderUsageReader<
}
return speeds;
}),
historyEnvironment: (config) =>
config === undefined || config.setupMode === "managed" || config.homePath.trim()
? []
: ["CODEX_HOME"],
directories: Effect.fn("codexUsageReader.directories")(function* ({ config, environment }) {
if (config === undefined) return [];
const path = yield* Path.Path;
Expand Down
45 changes: 45 additions & 0 deletions apps/server/src/provider/providerInstallation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { assert, describe, it } from "@effect/vitest";
import {
ProviderDriverKind,
ProviderInstanceId,
SecretProviderId,
type ProviderInstallState,
} from "@t3tools/contracts";
import * as HostProcess from "@t3tools/shared/HostProcess";
Expand All @@ -15,6 +16,7 @@ import * as Path from "effect/Path";
import * as Queue from "effect/Queue";
import * as Stream from "effect/Stream";

import * as SecretResolverTestkit from "../secrets/SecretResolver.testkit.ts";
import * as ServerSettings from "../serverSettings.ts";
import * as CodexInstallation from "./CodexInstallation.ts";
import * as AntigravityInstallation from "./AntigravityInstallation.ts";
Expand Down Expand Up @@ -62,6 +64,7 @@ const makeHarness = Effect.fn("providerInstallation.test.makeHarness")(function*
instance?: ProviderInstance;
others?: ReadonlyArray<ProviderInstance>;
settings?: Parameters<typeof ServerSettings.layerTest>[0];
readSecrets?: Parameters<typeof SecretResolverTestkit.layerTest>[0];
} = {},
) {
const calls: string[] = [];
Expand All @@ -77,6 +80,7 @@ const makeHarness = Effect.fn("providerInstallation.test.makeHarness")(function*
let watches = 0;
const dependencies = Layer.mergeAll(
ServerSettings.layerTest(input.settings),
SecretResolverTestkit.layerTest(input.readSecrets),
Layer.mock(ProviderInstanceRegistry.ProviderInstanceRegistry)({
getInstance: (id) => Effect.succeed(all.find((entry) => entry.instanceId === id)),
listInstances: Effect.succeed(all),
Expand Down Expand Up @@ -301,6 +305,47 @@ describe("provider installation routing", () => {
}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
);

describe("secret-backed PATH", () => {
const pathSecret = { provider: SecretProviderId.make("vault"), reference: "kv/path#dirs" };
const withSecretPath = (readSecrets: Parameters<typeof SecretResolverTestkit.layerTest>[0]) =>
makeHarness({
readSecrets,
settings: {
providerInstances: {
[ProviderInstanceId.make("antigravity-work")]: {
driver,
config: { binaryPath: "agy-test" },
environment: [{ name: "PATH", value: pathSecret, sensitive: true }],
},
},
},
});

it.effect("protects a binary found through a PATH read from a secret", () =>
Effect.gen(function* () {
const fs = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
const platform = yield* HostProcess.Platform;
const directory = yield* fs.makeTempDirectoryScoped({ prefix: "t3-provider-secret-path-" });
const executable = path.join(directory, platform === "win32" ? "agy-test.exe" : "agy-test");
yield* fs.writeFileString(executable, "test");
yield* fs.chmod(executable, 0o755);
const harness = yield* withSecretPath(() => [directory]);
yield* harness.router.remove({ instanceId });
assert.include(harness.protectedPaths(), executable);
}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
);

it.effect("fails the removal naming the variable and reference when it cannot be read", () =>
Effect.gen(function* () {
const harness = yield* withSecretPath(() => [undefined]);
const failed = yield* Effect.flip(harness.router.remove({ instanceId }));
assert.include(failed.detail, "PATH (vault:kv/path#dirs)");
assert.deepEqual(harness.calls, []);
}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
);
});

it.effect("protects another instance's binary found through its own PATH", () =>
Effect.gen(function* () {
const fs = yield* FileSystem.FileSystem;
Expand Down
Loading
Loading