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 .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#added by trueheads > will remove once supercombo adds multi-os support
launch.sh
51 changes: 49 additions & 2 deletions app/src/components/views/settings-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import {
Settings2,
RefreshCw,
Info,
RotateCcw,
} from "lucide-react";
import { getElectronAPI } from "@/lib/electron";
import { Checkbox } from "@/components/ui/checkbox";
Expand Down Expand Up @@ -162,10 +163,13 @@ export function SettingsView() {
hasOpenAIKey: boolean;
hasGoogleKey: boolean;
} | null>(null);
const [editingShortcut, setEditingShortcut] = useState<string | null>(null);
const [shortcutValue, setShortcutValue] = useState("");
const [shortcutError, setShortcutError] = useState<string | null>(null);
const scrollContainerRef = useRef<HTMLDivElement>(null);

// Get authentication status from setup store
const { claudeAuthStatus, codexAuthStatus } = useSetupStore();
const { claudeAuthStatus, codexAuthStatus, setClaudeAuthStatus, setCodexAuthStatus } = useSetupStore();

useEffect(() => {
setAnthropicKey(apiKeys.anthropic);
Expand Down Expand Up @@ -207,9 +211,52 @@ export function SettingsView() {
console.error("Failed to check API key status:", error);
}
}

// Check Claude auth status (re-fetch on mount to ensure persistence)
if (api?.setup?.getClaudeStatus) {
try {
const result = await api.setup.getClaudeStatus();
if (result.success && result.auth) {
// Cast to any because runtime API returns more properties than type definition
const auth = result.auth as any;
const authStatus = {
authenticated: auth.authenticated,
method: auth.method === "oauth_token"
? "oauth"
: auth.method?.includes("api_key")
? "api_key"
: "none",
hasCredentialsFile: false,
oauthTokenValid: auth.hasStoredOAuthToken,
apiKeyValid: auth.hasStoredApiKey || auth.hasEnvApiKey,
};
setClaudeAuthStatus(authStatus as any);
}
} catch (error) {
console.error("Failed to check Claude auth status:", error);
}
}

// Check Codex auth status (re-fetch on mount to ensure persistence)
if (api?.setup?.getCodexStatus) {
try {
const result = await api.setup.getCodexStatus();
if (result.success && result.auth) {
// Cast to any because runtime API returns more properties than type definition
const auth = result.auth as any;
setCodexAuthStatus({
authenticated: auth.authenticated,
method: auth.hasEnvApiKey ? "env" : auth.hasStoredApiKey ? "api_key" : "none",
apiKeyValid: auth.hasStoredApiKey || auth.hasEnvApiKey,
});
}
} catch (error) {
console.error("Failed to check Codex auth status:", error);
}
}
};
checkCliStatus();
}, []);
}, [setClaudeAuthStatus, setCodexAuthStatus]);

// Track scroll position to highlight active nav item
useEffect(() => {
Expand Down