Skip to content

Commit a6c051a

Browse files
docs: clarify keychain token precedence
Agent-Logs-Url: https://github.com/CakeRepository/1Password-MCP/sessions/4c5b132a-69be-40e9-ad6d-742b25bca276 Co-authored-by: CakeRepository <27045642+CakeRepository@users.noreply.github.com>
1 parent fd5f533 commit a6c051a

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ If you do not want to store the service account token directly in your MCP confi
8787
}
8888
```
8989

90-
`OP_SERVICE_ACCOUNT_TOKEN` still takes precedence when set. `OP_KEYCHAIN_ACCOUNT` is optional if your Keychain service name is already unique enough.
90+
Precedence is: CLI arguments (`--service-account-token` / `--token`) > `OP_SERVICE_ACCOUNT_TOKEN` > macOS Keychain lookup. `OP_KEYCHAIN_ACCOUNT` is optional if your Keychain service name is already unique enough.
9191

9292
### OpenAI Codex (TOML)
9393

src/config.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ export function resolveServiceAccountToken({
8080
}) => string | undefined;
8181
} = {}): Pick<ServerConfig, "serviceAccountToken" | "tokenSource"> {
8282
const tokenFromEnv = env.OP_SERVICE_ACCOUNT_TOKEN;
83-
const tokenFromKeychain =
84-
tokenFromArgs || tokenFromEnv
85-
? undefined
86-
: readKeychainToken({
87-
service: env.OP_KEYCHAIN_SERVICE,
88-
account: env.OP_KEYCHAIN_ACCOUNT,
89-
});
83+
let tokenFromKeychain: string | undefined;
84+
if (!tokenFromArgs && !tokenFromEnv) {
85+
tokenFromKeychain = readKeychainToken({
86+
service: env.OP_KEYCHAIN_SERVICE,
87+
account: env.OP_KEYCHAIN_ACCOUNT,
88+
});
89+
}
9090

9191
const serviceAccountToken = tokenFromArgs ?? tokenFromEnv ?? tokenFromKeychain;
9292

0 commit comments

Comments
 (0)