Commit Graph
5 Commits
Author SHA1 Message Date
bincxzandClaude Opus 4.6 cc2702b825 fix: decouple Codex agent auth from netcatty provider list (#705)
Codex agent auth must be determined entirely by ~/.codex/auth.json or
~/.codex/config.toml. Before this change, if the user configured any
OpenAI-compatible API provider in netcatty settings (for Catty agent use),
useAIChatStreaming would silently hand that provider's apiKey to the Codex
agent too, causing aiBridge to spawn codex-acp with authMethodId
"codex-api-key" and completely override the user's ChatGPT login.

The regression was introduced in PR #702 (v1.0.89) when findManagedAgent
Provider started matching generic "custom" providers for Codex. Users who
logged into Codex via ChatGPT and also had a netcatty-configured custom
provider saw the UI flip to "API mode" on refresh and their ChatGPT
session get ignored.

Remove the codex branch from the agentProviderId resolver and from
findManagedAgentProvider itself. Also drop the now-meaningless
hasCompatibleProvider hint on the Codex settings card and its i18n copy.
Claude agent behavior is unchanged.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-13 19:08:18 +08:00
bincxzandClaude Opus 4.6 18c001e9c5 fix: show custom config even when env_key is not exported yet
The first pass required both a custom model_provider in ~/.codex/config.toml
AND the referenced env_key to already be present in the shell environment.
If a user had the config file set up but hadn't (yet) exported the key in
their shell, detection returned null and the UI fell back to "Not
connected" + "Connect ChatGPT" — which is the exact flow they were trying
to avoid.

The config.toml is a strong enough signal of intent on its own. Keep the
integration in the connected_custom_config state regardless of env_key
availability, but expose envKeyPresent on the response so the UI can
explicitly warn "Warning: $MY_KEY is not set in your shell — export it".
Status label and color also flip to amber ("Custom config detected — env
var missing") so the state is easy to spot without dropping back to the
login prompt.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-13 01:53:33 +08:00
bincxzandClaude Opus 4.6 c2c6b265d4 feat: detect user's ~/.codex/config.toml custom provider as ready state
Users who hand-configure ~/.codex/config.toml with a custom model_provider
and matching [model_providers.<name>] entry are fully functional from the
Codex CLI, but netcatty only looked at codex login status — which reports
on ~/.codex/auth.json alone — and would therefore push them into the
ChatGPT login flow even though the CLI works for them.

Add a minimal TOML parser for the narrow subset we need (top-level keys
plus [model_providers.<name>] string tables), and readCodexCustomProvider
Config() to detect a usable custom-provider setup: an active model_provider
that isn't the built-in openai preset, pointing at a provider entry whose
env_key is set in the shell env (or api_key is hardcoded).

Surface this as a new integration state "connected_custom_config", add a
customConfig summary on the IPC response, and tweak the Codex settings
card so it shows the custom-provider name, hides the Connect ChatGPT
button, and drops the stale "OpenAI-compatible provider" hint when this
path is active.

At Codex-ACP spawn time, introduce getCodexAuthOverride() so we only pass
authMethodId: "chatgpt" when we truly have no other option. When a
netcatty-managed API key is present we still use "codex-api-key"; when the
user has a custom config we omit authMethodId entirely so codex-acp
resolves auth from the shell env / config.toml itself. Fold the detected
custom config (provider name, base url, env key presence) into the
provider reuse fingerprint so edits to config.toml invalidate cached ACP
instances.

Fixes the Codex half of #677 for users who skip Settings → AI providers.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-13 01:49:23 +08:00
bincxz 1e50b66407 fix: finish Codex provider follow-up for #677 2026-04-13 01:21:05 +08:00
bincxzandClaude Opus 4.6 a55da77471 refactor: fix security issues, remove dead code, and split monolithic files
Security:
- Fix command injection in 15+ shell interpolation sites with shellQuote()
- Add token-based authentication to MCP TCP server
- Fix heredoc delimiter collision in SFTP write fallbacks
- Add case-insensitive flag to mcpServerBridge command blocklist
- Add exhaustive default case to createModelFromConfig

Architecture:
- Split aiBridge.cjs (1971→1483 lines) into 4 modules:
  shellUtils, codexHelpers, claudeHelpers, ptyExec
- Split SettingsAITab.tsx (1480→520 lines) into 10 sub-components
- Extract shared processCattyStream from AIChatSidePanel.tsx (-168 lines)
- Consolidate duplicate PTY execution logic into shared ptyExec.cjs
- Consolidate duplicate stripAnsi/toUnpackedAsarPath utilities

Code quality:
- Remove ~33 debug console.log statements from production code
- Remove dead code: terminal_read_output stub, checkToolPermission,
  isCommandAllowed, READ_ONLY_TOOLS
- Unify bridge type accessor in useAIState.ts (eliminate 15 unsafe casts)
- Add localStorage session pruning (50 sessions / 200 messages cap)
- Fix ModelSelector onBlur race condition (setTimeout → preventDefault)
- Fix duplicate getShellEnv() calls in Codex helpers
- Remove unused _config param from claudeAgentAdapter
- Type claudeAgentAdapter bridge parameter directly as ClaudeBridge

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-15 19:45:50 +08:00