make mom fetch apiKey from authStorage instead of env vars

This commit is contained in:
Rony Kelner 2025-12-29 11:54:09 +09:00
parent c193ef74d2
commit 9bcfab3863
3 changed files with 34 additions and 17 deletions

View file

@ -39,10 +39,14 @@ export interface AgentRunner {
abort(): void;
}
function getAnthropicApiKey(): string {
const key = process.env.ANTHROPIC_OAUTH_TOKEN || process.env.ANTHROPIC_API_KEY;
async function getAnthropicApiKey(authStorage: AuthStorage): Promise<string> {
const key = await authStorage.getApiKey("anthropic");
if (!key) {
throw new Error("ANTHROPIC_OAUTH_TOKEN or ANTHROPIC_API_KEY must be set");
throw new Error(
"No API key found for anthropic.\n\n" +
"Set an API key environment variable, or use /login with Anthropic and link to auth.json from " +
join(homedir(), ".pi", "mom", "auth.json"),
);
}
return key;
}
@ -417,6 +421,11 @@ function createRunner(sandboxConfig: SandboxConfig, channelId: string, channelDi
const sessionManager = new MomSessionManager(channelDir);
const settingsManager = new MomSettingsManager(join(channelDir, ".."));
// Create AuthStorage and ModelRegistry
// Auth stored outside workspace so agent can't access it
const authStorage = new AuthStorage(join(homedir(), ".pi", "mom", "auth.json"));
const modelRegistry = new ModelRegistry(authStorage);
// Create agent
const agent = new Agent({
initialState: {
@ -427,7 +436,7 @@ function createRunner(sandboxConfig: SandboxConfig, channelId: string, channelDi
},
messageTransformer,
transport: new ProviderTransport({
getApiKey: async () => getAnthropicApiKey(),
getApiKey: async () => getAnthropicApiKey(authStorage),
}),
});
@ -438,11 +447,6 @@ function createRunner(sandboxConfig: SandboxConfig, channelId: string, channelDi
log.logInfo(`[${channelId}] Loaded ${loadedSession.messages.length} messages from context.jsonl`);
}
// Create AuthStorage and ModelRegistry for AgentSession
// Auth stored outside workspace so agent can't access it
const authStorage = new AuthStorage(join(homedir(), ".pi", "mom", "auth.json"));
const modelRegistry = new ModelRegistry(authStorage);
// Create AgentSession wrapper
const session = new AgentSession({
agent,

View file

@ -16,8 +16,6 @@ import { ChannelStore } from "./store.js";
const MOM_SLACK_APP_TOKEN = process.env.MOM_SLACK_APP_TOKEN;
const MOM_SLACK_BOT_TOKEN = process.env.MOM_SLACK_BOT_TOKEN;
const ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
const ANTHROPIC_OAUTH_TOKEN = process.env.ANTHROPIC_OAUTH_TOKEN;
interface ParsedArgs {
workingDir?: string;
@ -74,8 +72,8 @@ if (!parsedArgs.workingDir) {
const { workingDir, sandbox } = { workingDir: parsedArgs.workingDir, sandbox: parsedArgs.sandbox };
if (!MOM_SLACK_APP_TOKEN || !MOM_SLACK_BOT_TOKEN || (!ANTHROPIC_API_KEY && !ANTHROPIC_OAUTH_TOKEN)) {
console.error("Missing env: MOM_SLACK_APP_TOKEN, MOM_SLACK_BOT_TOKEN, ANTHROPIC_API_KEY or ANTHROPIC_OAUTH_TOKEN");
if (!MOM_SLACK_APP_TOKEN || !MOM_SLACK_BOT_TOKEN) {
console.error("Missing env: MOM_SLACK_APP_TOKEN, MOM_SLACK_BOT_TOKEN");
process.exit(1);
}