Merge branch 'main' into context-optimization

app/lib/stores/settings.ts

@@ -15,10 +15,33 @@ export interface Shortcuts {
   toggleTerminal: Shortcut;
 }
 
+export interface Provider {
+  name: string;
+  isEnabled: boolean;
+}
+
 export interface Settings {
   shortcuts: Shortcuts;
+  providers: Provider[];
 }
 
+export const providersList: Provider[] = [
+  { name: 'Groq', isEnabled: false },
+  { name: 'HuggingFace', isEnabled: false },
+  { name: 'OpenAI', isEnabled: false },
+  { name: 'Anthropic', isEnabled: false },
+  { name: 'OpenRouter', isEnabled: false },
+  { name: 'Google', isEnabled: false },
+  { name: 'Ollama', isEnabled: false },
+  { name: 'OpenAILike', isEnabled: false },
+  { name: 'Together', isEnabled: false },
+  { name: 'Deepseek', isEnabled: false },
+  { name: 'Mistral', isEnabled: false },
+  { name: 'Cohere', isEnabled: false },
+  { name: 'LMStudio', isEnabled: false },
+  { name: 'xAI', isEnabled: false },
+];
+
 export const shortcutsStore = map<Shortcuts>({
   toggleTerminal: {
     key: 'j',
@@ -29,6 +52,7 @@ export const shortcutsStore = map<Shortcuts>({
 
 export const settingsStore = map<Settings>({
   shortcuts: shortcutsStore.get(),
+  providers: providersList,
 });
 
 shortcutsStore.subscribe((shortcuts) => {

app/lib/stores/workbench.ts

@@ -15,6 +15,7 @@ import { Octokit, type RestEndpointMethodTypes } from '@octokit/rest';
 import * as nodePath from 'node:path';
 import { extractRelativePath } from '~/utils/diff';
 import { description } from '~/lib/persistence';
+import Cookies from 'js-cookie';
 
 export interface ArtifactState {
   id: string;
@@ -402,15 +403,14 @@ export class WorkbenchStore {
     return syncedFiles;
   }
 
-  async pushToGitHub(repoName: string, githubUsername: string, ghToken: string) {
+  async pushToGitHub(repoName: string, githubUsername?: string, ghToken?: string) {
     try {
-      // Get the GitHub auth token from environment variables
-      const githubToken = ghToken;
+      // Use cookies if username and token are not provided
+      const githubToken = ghToken || Cookies.get('githubToken');
+      const owner = githubUsername || Cookies.get('githubUsername');
 
-      const owner = githubUsername;
-
-      if (!githubToken) {
-        throw new Error('GitHub token is not set in environment variables');
+      if (!githubToken || !owner) {
+        throw new Error('GitHub token or username is not set in cookies or provided.');
       }
 
       // Initialize Octokit with the auth token
@@ -507,7 +507,8 @@ export class WorkbenchStore {
 
       alert(`Repository created and code pushed: ${repo.html_url}`);
     } catch (error) {
-      console.error('Error pushing to GitHub:', error instanceof Error ? error.message : String(error));
+      console.error('Error pushing to GitHub:', error);
+      throw error; // Rethrow the error for further handling
     }
   }
 }