tarsk 0.4.27 → 0.4.28

package/dist/index.js

@@ -769,6 +769,14 @@ var PROGRAMS_CONFIG = {
   Terminal: {
     name: "Terminal",
     appName: "Terminal"
+  },
+  "Devin Desktop": {
+    name: "Devin Desktop",
+    appName: ["Devin", "Devin Desktop"]
+  },
+  Antigravity: {
+    name: "Antigravity",
+    appName: ["com.google.antigravity-ide", "Antigravity IDE"]
   }
 };
 var AVAILABLE_PROGRAMS = Object.keys(PROGRAMS_CONFIG);
@@ -1820,9 +1828,9 @@ function createGrepTool(cwd, options) {
             const effectiveLimit = Math.max(1, limit ?? DEFAULT_LIMIT2);
             const formatPath = (filePath) => {
               if (isDirectory) {
-                const relative7 = path2.relative(searchPath, filePath);
-                if (relative7 && !relative7.startsWith("..")) {
-                  return relative7.replace(/\\/g, "/");
+                const relative8 = path2.relative(searchPath, filePath);
+                if (relative8 && !relative8.startsWith("..")) {
+                  return relative8.replace(/\\/g, "/");
                 }
               }
               return path2.basename(filePath);
@@ -4140,16 +4148,56 @@ var ModelManager = class {
 };
 
 // src/features/providers/provider-resolver.ts
+function getProviderApiKeyEnvName(providerEnv) {
+  if (providerEnv.length === 0) {
+    return "";
+  }
+  const explicitApiKeyEnv = providerEnv.find((envName) => /api_key$/i.test(envName));
+  return explicitApiKeyEnv ?? providerEnv[providerEnv.length - 1];
+}
+function getProviderApiUrlEnvName(providerName) {
+  return `${providerName.toUpperCase().replace(/-/g, "_")}_API_URL`;
+}
+function getProviderResourceName(providerEnv) {
+  const explicitResourceEnv = providerEnv.find((envName) => /resource_name$/i.test(envName));
+  return explicitResourceEnv ?? providerEnv[0] ?? "";
+}
+function resolveAzureApiUrl(providerEnv) {
+  const resourceEnvName = getProviderResourceName(providerEnv);
+  const resourceName = process.env[resourceEnvName];
+  if (!resourceName) {
+    return "";
+  }
+  return `https://${resourceName}.openai.azure.com/openai/v1`;
+}
+function resolveTemplate(template, envValues) {
+  let hasMissingValue = false;
+  const resolved = template.replace(/\$\{([A-Z0-9_]+)\}/gi, (_match, envName) => {
+    const value = envValues[envName] ?? process.env[envName] ?? "";
+    if (!value) {
+      hasMissingValue = true;
+    }
+    return value;
+  });
+  return hasMissingValue ? "" : resolved;
+}
 async function resolveProviderConfig(providerName) {
   const slug = providerName.toLowerCase();
   const catalogProvider = await getCatalogProvider(slug);
   if (!catalogProvider) return null;
-  return catalogProvider;
+  const apiKeyEnv = getProviderApiKeyEnvName(catalogProvider.env ?? []);
+  const apiUrlEnvName = getProviderApiUrlEnvName(slug);
+  const api = slug === "azure" ? resolveAzureApiUrl(catalogProvider.env ?? []) : process.env[apiUrlEnvName] || (catalogProvider.api ? resolveTemplate(catalogProvider.api, process.env) : "");
+  return {
+    ...catalogProvider,
+    api,
+    apiKeyEnv
+  };
 }
 async function resolveProviderKeyName(providerName) {
   const slug = providerName.toLowerCase();
   const catalogProvider = await getCatalogProvider(slug);
-  if (catalogProvider?.env?.[0]) return catalogProvider.env[0];
+  if (catalogProvider?.env?.length) return getProviderApiKeyEnvName(catalogProvider.env);
   return "";
 }
 
@@ -4346,7 +4394,7 @@ function createGenerateImageTool(options) {
             details: void 0
           };
         }
-        let apiKey = providerConfig.env && providerConfig.env.length > 0 ? process.env[providerConfig.env[0]] : void 0;
+        let apiKey = providerConfig.apiKeyEnv ? process.env[providerConfig.apiKeyEnv] : void 0;
         if (!apiKey) {
           const providerKeys = await metadataManager.getProviderKeys();
           apiKey = providerKeys[providerConfig.id];
@@ -4784,8 +4832,12 @@ function createToolSearchTool(options) {
       let matched = [];
       if (parsed.mode === "select") {
         for (const name of parsed.names) {
-          const tool = deferredTools.get(name);
-          if (tool) matched.push(tool);
+          for (const [toolName, tool] of deferredTools.entries()) {
+            if (toolName.toLowerCase() === name) {
+              matched.push(tool);
+              break;
+            }
+          }
         }
       } else {
         const candidates = [];
@@ -5039,6 +5091,7 @@ var EventQueue = class {
   finalContent = "";
   errorOccurred = false;
   toolCallCount = 0;
+  lastErrorMessage;
   /**
    * Processes Pi Agent events and transforms them into AgentEvent format
    */
@@ -5107,6 +5160,9 @@ var EventQueue = class {
     } else if (event.type === "agent_end") {
       const messages = event.messages;
       const lastAssistant = [...messages].reverse().find((m) => "role" in m && m.role === "assistant");
+      if (lastAssistant && "errorMessage" in lastAssistant && typeof lastAssistant.errorMessage === "string") {
+        this.lastErrorMessage = lastAssistant.errorMessage;
+      }
       if (lastAssistant) {
         const extracted = extractTextFromAssistantMessage(lastAssistant);
         if (extracted && extracted !== this.finalContent) {
@@ -5220,14 +5276,14 @@ async function executeSubagent(options) {
   if (!providerConfig) {
     throw new Error(`Unknown provider for subagent: ${providerName}`);
   }
-  let apiKey = providerConfig.env && providerConfig.env.length > 0 ? process.env[providerConfig.env[0]] : void 0;
+  let apiKey = providerConfig.apiKeyEnv ? process.env[providerConfig.apiKeyEnv] : void 0;
   if (!apiKey) {
     const providerKeys = await metadataManager.getProviderKeys();
     apiKey = providerKeys[providerConfig.id];
   }
   if (!apiKey) {
     throw new Error(
-      `No API key found for subagent provider: ${providerName}. Set ${providerConfig.env && providerConfig.env.length > 0 ? providerConfig.env[0] : "an API key"} in environment variables or configuration.`
+      `No API key found for subagent provider: ${providerName}. Set ${providerConfig.apiKeyEnv ?? "an API key"} in environment variables or configuration.`
     );
   }
   const resolvedModel = resolveModel(providerName, model, providerConfig);
@@ -6115,10 +6171,94 @@ async function loadAgentSystemPrompt(threadPath, tools, skills, planMode, agents
 var cachedStreamFn = (model, context, options) => {
   return streamSimple(model, context, { ...options, cacheRetention: "long" });
 };
+function summarizeAssistantResponse(response) {
+  const lines = response.split("\n").map((line) => line.trim()).filter((line) => line.length > 0);
+  const salient = lines.filter(
+    (line) => /^(#+\s|[-*]\s|\d+\.\s|```|changed|created|updated|deleted|fixed|implemented|added|removed|renamed|moved|tested|next|summary|result)/i.test(
+      line
+    ) || line.length <= 180
+  );
+  const summary = (salient.length > 0 ? salient : lines).slice(0, 12).join("\n");
+  return summary.length > 3e3 ? `${summary.slice(0, 3e3)}\u2026` : summary;
+}
+function getAssistantHistoryContent(exchange, isMostRecent) {
+  if (isMostRecent) {
+    return exchange.assistantResponse;
+  }
+  return exchange.assistantSummary ?? summarizeAssistantResponse(exchange.assistantResponse);
+}
+function buildAssistantHistoryText(content, isMostRecent) {
+  if (isMostRecent) {
+    return content;
+  }
+  return `[Earlier assistant response summarized to reduce context tokens]
+${content}`;
+}
+function serializeLogValue(value, depth = 0, seen = /* @__PURE__ */ new WeakSet()) {
+  if (value === null || value === void 0) {
+    return value;
+  }
+  const valueType = typeof value;
+  if (valueType === "string" || valueType === "number" || valueType === "boolean") {
+    return value;
+  }
+  if (valueType === "bigint" || valueType === "symbol") {
+    return "[Primitive]";
+  }
+  if (valueType === "function") {
+    return "[Function]";
+  }
+  if (value instanceof Error) {
+    const serializedError = {
+      name: value.name,
+      message: value.message
+    };
+    if (value.stack) {
+      serializedError.stack = value.stack;
+    }
+    if ("cause" in value) {
+      serializedError.cause = serializeLogValue(
+        value.cause,
+        depth + 1,
+        seen
+      );
+    }
+    const errorObject = value;
+    for (const [key, nestedValue] of Object.entries(errorObject)) {
+      if (key in serializedError) continue;
+      serializedError[key] = serializeLogValue(nestedValue, depth + 1, seen);
+    }
+    return serializedError;
+  }
+  if (Array.isArray(value)) {
+    if (depth >= 4) {
+      return "[Truncated]";
+    }
+    return value.slice(0, 50).map((item) => serializeLogValue(item, depth + 1, seen));
+  }
+  if (valueType === "object") {
+    if (seen.has(value)) {
+      return "[Circular]";
+    }
+    if (depth >= 4) {
+      return "[Truncated]";
+    }
+    seen.add(value);
+    const serializedObject = {};
+    const plainObject = value;
+    for (const [key, nestedValue] of Object.entries(plainObject).slice(0, 50)) {
+      serializedObject[key] = serializeLogValue(nestedValue, depth + 1, seen);
+    }
+    return serializedObject;
+  }
+  return "[Unsupported value]";
+}
 function buildHistoryMessages(history) {
   const messages = [];
   const now = Date.now();
-  for (const exchange of history) {
+  history.forEach((exchange, index) => {
+    const isMostRecent = index === history.length - 1;
+    const assistantContent = getAssistantHistoryContent(exchange, isMostRecent);
     messages.push({
       role: "user",
       content: exchange.userMessage,
@@ -6126,7 +6266,9 @@ function buildHistoryMessages(history) {
     });
     messages.push({
       role: "assistant",
-      content: [{ type: "text", text: exchange.assistantResponse }],
+      content: [
+        { type: "text", text: buildAssistantHistoryText(assistantContent, isMostRecent) }
+      ],
       api: "",
       provider: "",
       model: "",
@@ -6141,7 +6283,7 @@ function buildHistoryMessages(history) {
       stopReason: "stop",
       timestamp: now
     });
-  }
+  });
   return messages;
 }
 var PiExecutorImpl = class {
@@ -6171,7 +6313,7 @@ var PiExecutorImpl = class {
       if (!providerConfig) {
         throw new Error(`Unknown provider: ${providerName}`);
       }
-      let apiKey = providerConfig.env && providerConfig.env.length > 0 ? process.env[providerConfig.env[0]] : void 0;
+      let apiKey = providerConfig.apiKeyEnv ? process.env[providerConfig.apiKeyEnv] : void 0;
       let apiKeySource = "environment";
       if (!apiKey) {
         try {
@@ -6187,7 +6329,7 @@ var PiExecutorImpl = class {
       }
       if (!apiKey) {
         throw new Error(
-          `No API key found for provider: ${providerName}. Set ${providerConfig.env && providerConfig.env.length > 0 ? providerConfig.env[0] : "an API key"} in environment variables or configuration.`
+          `No API key found for provider: ${providerName}. Set ${providerConfig.apiKeyEnv ?? "an API key"} in environment variables or configuration.`
         );
       }
       if (apiKey.includes(":") && apiKey.length > 100) {
@@ -6302,15 +6444,27 @@ ${decoded}
 
 ${userPrompt}`;
       }
-      console.log(
-        `[ai] Attachments: ${context.attachments?.length ?? 0} total, ${images.length} image(s), ${textAttachments.length} text file(s)`,
-        (context.attachments ?? []).map((a) => ({
+      const promptRequest = {
+        provider: providerName,
+        model,
+        cwd,
+        prompt: finalPrompt,
+        promptLength: finalPrompt.length,
+        promptPreview: finalPrompt.substring(0, 200) + (finalPrompt.length > 200 ? "..." : ""),
+        imageCount: images.length,
+        images: images.map((img) => ({
+          mimeType: img.mimeType,
+          dataLength: img.data?.length ?? 0
+        })),
+        attachments: (context.attachments ?? []).map((a) => ({
           name: a.name,
           mimeType: a.mimeType,
           contentLength: a.content?.length ?? 0
-        })),
-        "images \u2192",
-        images.map((img) => ({ mimeType: img.mimeType, dataLength: img.data?.length ?? 0 }))
+        }))
+      };
+      console.log(
+        `[ai] Attachments: ${context.attachments?.length ?? 0} total, ${images.length} image(s), ${textAttachments.length} text file(s)`,
+        promptRequest
       );
       const promptDone = agent.prompt(finalPrompt, images.length > 0 ? images : void 0).then(() => {
         console.log(`[ai] Agent prompt completed successfully`);
@@ -6319,7 +6473,8 @@ ${userPrompt}`;
       }).catch((err) => {
         const errMessage = err instanceof Error ? err.message : String(err);
         console.error(`[ai] Agent prompt failed:`, {
-          error: errMessage,
+          request: promptRequest,
+          error: serializeLogValue(err),
           errorType: err instanceof Error ? err.constructor.name : typeof err
         });
         if (!eventQueue.errorOccurred) {
@@ -6373,12 +6528,20 @@ ${userPrompt}`;
               };
             } else {
               console.log("[ai] \u26A0\uFE0F  Agent ended with no text content and no tool calls.");
+              const upstreamError = eventQueue.lastErrorMessage ? { message: eventQueue.lastErrorMessage } : void 0;
+              console.error("[ai] Agent ended without text content:", {
+                request: promptRequest,
+                upstreamError,
+                finalContentLength: eventQueue.finalContent.length,
+                toolCallCount: eventQueue.toolCallCount
+              });
               yield {
                 type: "error",
                 content: `The model ${model} from ${providerName} did not provide a response to your prompt. Check your API key and balance and try again.`,
                 error: {
                   code: "NO_CONTENT_NO_TOOLS",
-                  message: `The model ${model} from ${providerName} did not provide a response to your prompt.`
+                  message: `The model ${model} from ${providerName} did not provide a response to your prompt.`,
+                  details: upstreamError
                 }
               };
             }
@@ -6485,6 +6648,63 @@ var ProcessingStateManagerImpl = class {
   }
 };
 
+// src/core/env-manager.ts
+import { promises as fs } from "fs";
+import { join as join11 } from "path";
+function updateRuntimeEnv(values) {
+  for (const [key, value] of Object.entries(values)) {
+    process.env[key] = value;
+  }
+}
+async function updateEnvFile(keyNames) {
+  const envPath = join11(process.cwd(), ".env");
+  let content = "";
+  try {
+    content = await fs.readFile(envPath, "utf-8");
+  } catch {
+  }
+  const lines = content.split("\n");
+  const envMap = {};
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (trimmed && !trimmed.startsWith("#") && trimmed.includes("=")) {
+      const index = trimmed.indexOf("=");
+      const key = trimmed.substring(0, index).trim();
+      const value = trimmed.substring(index + 1).trim();
+      envMap[key] = value;
+    }
+  }
+  for (const [key, value] of Object.entries(keyNames)) {
+    if (key) {
+      envMap[key] = value;
+    }
+  }
+  const newLines = [];
+  for (const [key, value] of Object.entries(envMap)) {
+    newLines.push(`${key}=${value}`);
+  }
+  await fs.writeFile(envPath, newLines.join("\n") + "\n", "utf-8");
+}
+async function readEnvFile() {
+  const envPath = join11(process.cwd(), ".env");
+  const envMap = {};
+  try {
+    const content = await fs.readFile(envPath, "utf-8");
+    const lines = content.split("\n");
+    for (const line of lines) {
+      const trimmed = line.trim();
+      if (trimmed && !trimmed.startsWith("#") && trimmed.includes("=")) {
+        const index = trimmed.indexOf("=");
+        const key = trimmed.substring(0, index).trim();
+        const value = trimmed.substring(index + 1).trim();
+        envMap[key] = value;
+      }
+    }
+  } catch {
+  }
+  return envMap;
+}
+
 // src/features/ask-user/ask-user.routes.ts
 import { Hono } from "hono";
 
@@ -6659,7 +6879,7 @@ import { randomUUID as randomUUID4 } from "crypto";
 
 // src/features/skills/skills.manager.ts
 import { readdir as readdir4, readFile as readFile6 } from "fs/promises";
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 import { existsSync as existsSync9 } from "fs";
 import { homedir as homedir5 } from "os";
 function parseFrontmatter(markdown) {
@@ -6707,10 +6927,10 @@ function parseFrontmatter(markdown) {
   return { metadata, content };
 }
 function getGlobalSkillsDir() {
-  return join11(homedir5(), ".agents", "skills");
+  return join12(homedir5(), ".agents", "skills");
 }
 function getProjectSkillsDir(threadPath) {
-  return join11(threadPath, ".agents", "skills");
+  return join12(threadPath, ".agents", "skills");
 }
 function validateSkillName(name) {
   if (!name || name.length === 0 || name.length > 64) {
@@ -6763,8 +6983,8 @@ var SkillManager = class {
       for (const entry of entries) {
         if (!entry.isDirectory()) continue;
         const skillDirName = entry.name;
-        const skillPath = join11(dir, skillDirName);
-        const skillFilePath = join11(skillPath, "SKILL.md");
+        const skillPath = join12(dir, skillDirName);
+        const skillFilePath = join12(skillPath, "SKILL.md");
         if (!existsSync9(skillFilePath)) {
           console.warn(`Skipping skill directory ${skillDirName}: SKILL.md not found`);
           continue;
@@ -6944,7 +7164,7 @@ async function activateSkills(allSkills, taskDescription, thread, options) {
 
 // src/features/agents/agents.manager.ts
 import { readdir as readdir5, readFile as readFile7 } from "fs/promises";
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 import { existsSync as existsSync10 } from "fs";
 import { homedir as homedir6 } from "os";
 function parseFrontmatter2(markdown) {
@@ -7002,10 +7222,10 @@ function validateDescription2(description) {
   return !!description && description.length > 0 && description.length <= 1024;
 }
 function getGlobalAgentsDir() {
-  return join12(homedir6(), ".agents", "agents");
+  return join13(homedir6(), ".agents", "agents");
 }
 function getProjectAgentsDir(threadPath) {
-  return join12(threadPath, ".agents", "agents");
+  return join13(threadPath, ".agents", "agents");
 }
 var AgentsManager = class {
   /**
@@ -7037,8 +7257,8 @@ var AgentsManager = class {
       for (const entry of entries) {
         if (!entry.isDirectory()) continue;
         const agentDirName = entry.name;
-        const agentPath = join12(dir, agentDirName);
-        const agentFilePath = join12(agentPath, "AGENT.md");
+        const agentPath = join13(dir, agentDirName);
+        const agentFilePath = join13(agentPath, "AGENT.md");
         if (!existsSync10(agentFilePath)) {
           console.warn(`[agents] Skipping agent directory ${agentDirName}: AGENT.md not found`);
           continue;
@@ -7225,7 +7445,7 @@ function extractAssistantContent(events, fallback) {
 // src/features/chat/chat-post.route.ts
 init_database();
 import { readFile as readFile8, unlink } from "fs/promises";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 
 // src/features/project-todos/project-todos.database.ts
 init_database();
@@ -8218,7 +8438,7 @@ ${result.output}`;
           try {
             const todo = await getTodoByThreadId(db, threadId);
             if (todo && todo.status === "Plan") {
-              const planFilePath = join13(threadPath, `${todo.id}-plan.md`);
+              const planFilePath = join14(threadPath, `${todo.id}-plan.md`);
               try {
                 const planContent = await readFile8(planFilePath, "utf-8");
                 await updateTodo(db, todo.id, { description: planContent.trim() });
@@ -8430,13 +8650,15 @@ async function updateMessage(db, messageId, content, events, imageUrl) {
       if (hasMessageUsage) {
         if (event.type === "message" && event.message?.usage) {
           const usage = event.message.usage;
-          inputTokens += usage.input ?? 0;
-          outputTokens += usage.output ?? 0;
+          const tokens = calculateCostEquivalentTokens(usage);
+          inputTokens += tokens.inputTokens;
+          outputTokens += tokens.outputTokens;
         }
       } else {
         if (event.type === "toolcall_delta" && event.partial?.usage) {
-          inputTokens += event.partial.usage.input ?? 0;
-          outputTokens += event.partial.usage.output ?? 0;
+          const tokens = calculateCostEquivalentTokens(event.partial.usage);
+          inputTokens += tokens.inputTokens;
+          outputTokens += tokens.outputTokens;
         }
       }
     }
@@ -8467,6 +8689,34 @@ async function updateMessage(db, messageId, content, events, imageUrl) {
     throw error;
   }
 }
+function calculateCostEquivalentTokens(usage) {
+  const input = usage.input ?? 0;
+  const output = usage.output ?? 0;
+  const cacheRead = usage.cacheRead ?? 0;
+  const cacheWrite = usage.cacheWrite ?? 0;
+  const cachedInput = cacheRead + cacheWrite;
+  const uncachedInput = input >= cachedInput ? input - cachedInput : input;
+  const inputCost = usage.cost?.input ?? 0;
+  const cacheCost = (usage.cost?.cacheRead ?? 0) + (usage.cost?.cacheWrite ?? 0);
+  if (uncachedInput > 0 && inputCost > 0 && cacheCost > 0) {
+    const inputCostPerToken = inputCost / uncachedInput;
+    const costEquivalentCachedInput = cacheCost / inputCostPerToken;
+    return {
+      inputTokens: Math.round(uncachedInput + costEquivalentCachedInput),
+      outputTokens: output
+    };
+  }
+  if (input >= cachedInput) {
+    return {
+      inputTokens: uncachedInput + cachedInput,
+      outputTokens: output
+    };
+  }
+  return {
+    inputTokens: input,
+    outputTokens: output
+  };
+}
 async function getConversationHistory(db, threadId) {
   try {
     const result = await db.execute(
@@ -9760,6 +10010,7 @@ var MetadataManager = class {
         await setState(this.db, "selectedThreadId", state.selectedThreadId);
         await setState(this.db, "enabledModels", state.enabledModels);
         await setState(this.db, "enabledImageModels", state.enabledImageModels);
+        await setState(this.db, "providerEnvValues", state.providerEnvValues);
         await setState(this.db, "onboardingCompleted", state.onboardingCompleted);
         const encryptedKeys = {};
         for (const [provider, key] of Object.entries(state.providerKeys)) {
@@ -9792,6 +10043,7 @@ var MetadataManager = class {
       const onboardingCompleted = allState.onboardingCompleted || false;
       const enabledModels = allState.enabledModels || {};
       const enabledImageModels = allState.enabledImageModels || {};
+      const providerEnvValues = allState.providerEnvValues || {};
       const encryptedKeys = allState.providerKeys || {};
       const providerKeys = {};
       let needsMigration = false;
@@ -9824,6 +10076,7 @@ var MetadataManager = class {
         selectedThreadId,
         onboardingCompleted,
         providerKeys,
+        providerEnvValues,
         enabledModels,
         enabledImageModels
       };
@@ -9902,6 +10155,36 @@ var MetadataManager = class {
       throw new Error(`Failed to get provider keys: ${errorMessage}`);
     }
   }
+  /**
+   * Save provider environment values (non-secret values such as Azure resource name)
+   * @param values - Environment values to merge into metadata state
+   */
+  async saveProviderEnvValues(values) {
+    try {
+      const state = await this.loadState();
+      state.providerEnvValues = {
+        ...state.providerEnvValues,
+        ...values
+      };
+      await this.saveState(state);
+    } catch (error) {
+      throw new Error(`Failed to save provider environment values: ${String(error)}`);
+    }
+  }
+  /**
+   * Get provider environment values stored in metadata state
+   * @returns Record of environment variable names to values
+   */
+  async getProviderEnvValues() {
+    try {
+      const state = await this.loadState();
+      return state.providerEnvValues;
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      console.error("[MetadataManager] Failed to get provider environment values:", errorMessage);
+      throw new Error(`Failed to get provider environment values: ${errorMessage}`);
+    }
+  }
   /**
    * Set the selected thread ID
    * @param threadId - Thread ID to select (or null to deselect)
@@ -10086,7 +10369,7 @@ async function handleGetAvailableModels(c, modelManager) {
       const bEnabled = enabledModelIds.has(b.id) ? 0 : 1;
       return aEnabled - bEnabled;
     });
-    return c.json({ provider, models });
+    return c.json({ provider, models, enabledModelIds: [...enabledModelIds] });
   } catch (error) {
     const message = error instanceof Error ? error.message : "Unknown error";
     return c.json({ error: message }, 500);
@@ -10958,10 +11241,10 @@ async function handleCheckRunning(c, projectManager) {
 
 // src/core/run-command-detector.ts
 import { readFile as readFile9 } from "fs/promises";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 async function detectPackageManager(projectPath) {
   try {
-    const packageJsonPath = join14(projectPath, "package.json");
+    const packageJsonPath = join15(projectPath, "package.json");
     const content = await readFile9(packageJsonPath, "utf-8");
     const packageJson = JSON.parse(content);
     if (packageJson.packageManager) {
@@ -10977,7 +11260,7 @@ async function detectPackageManager(projectPath) {
 }
 async function detectRunScripts(projectPath) {
   try {
-    const packageJsonPath = join14(projectPath, "package.json");
+    const packageJsonPath = join15(projectPath, "package.json");
     const content = await readFile9(packageJsonPath, "utf-8");
     const packageJson = JSON.parse(content);
     const scripts = packageJson.scripts ?? {};
@@ -11024,7 +11307,7 @@ async function suggestRunCommand(projectPath) {
 
 // src/features/projects/projects-package-scripts.route.ts
 import { readFile as readFile10 } from "fs/promises";
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 import { glob } from "glob";
 function formatScriptName(scriptName) {
   return scriptName.replace(/[-:_]/g, " ").replace(/\b\w/g, (l) => l.toUpperCase());
@@ -11052,7 +11335,7 @@ async function findPackageScripts(projectPath) {
     const packageManager = await detectPackageManager(projectPath);
     for (const filePath of packageJsonFiles) {
       try {
-        const fullPath = join15(projectPath, filePath);
+        const fullPath = join16(projectPath, filePath);
         const content = await readFile10(fullPath, "utf-8");
         const packageJson = JSON.parse(content);
         if (packageJson.scripts) {
@@ -11101,7 +11384,7 @@ async function handleGetPackageScripts(c, projectManager) {
 
 // src/features/projects/projects-ai-files.route.ts
 import { readdir as readdir6, readFile as readFile11, writeFile as writeFile2, mkdir, access as access2, rm } from "fs/promises";
-import { join as join16, extname as extname3, basename } from "path";
+import { join as join17, extname as extname3, basename } from "path";
 import { existsSync as existsSync11 } from "fs";
 var IGNORED_DIRS = /* @__PURE__ */ new Set([
   ".git",
@@ -11120,8 +11403,8 @@ async function buildFullTree(dirPath, relativeDirPath) {
   try {
     const entries = await readdir6(dirPath, { withFileTypes: true });
     for (const entry of entries) {
-      const entryRelPath = join16(relativeDirPath, entry.name);
-      const entryAbsPath = join16(dirPath, entry.name);
+      const entryRelPath = join17(relativeDirPath, entry.name);
+      const entryAbsPath = join17(dirPath, entry.name);
       if (entry.isDirectory()) {
         const children = await buildFullTree(entryAbsPath, entryRelPath);
         nodes.push({
@@ -11149,8 +11432,8 @@ async function buildMarkdownFilteredTree(dirPath, relativeDirPath) {
   try {
     const entries = await readdir6(dirPath, { withFileTypes: true });
     for (const entry of entries) {
-      const entryRelPath = join16(relativeDirPath, entry.name);
-      const entryAbsPath = join16(dirPath, entry.name);
+      const entryRelPath = join17(relativeDirPath, entry.name);
+      const entryAbsPath = join17(dirPath, entry.name);
       if (entry.isDirectory()) {
         if (IGNORED_DIRS.has(entry.name)) continue;
         const children = await buildMarkdownFilteredTree(entryAbsPath, entryRelPath);
@@ -11185,8 +11468,8 @@ async function buildAIFileTree(projectPath) {
     { key: "agents", label: "Agents" }
   ];
   for (const { key, label } of agentsFolders) {
-    const relPath = join16(".agents", key);
-    const absPath = join16(projectPath, relPath);
+    const relPath = join17(".agents", key);
+    const absPath = join17(projectPath, relPath);
     const exists = existsSync11(absPath);
     if (exists) {
       const children = await buildFullTree(absPath, relPath);
@@ -11221,7 +11504,7 @@ async function buildAIFileTree(projectPath) {
       if (entry.name === ".agents" || entry.name === "AGENTS.md" || IGNORED_DIRS.has(entry.name))
         continue;
       const entryRelPath = entry.name;
-      const entryAbsPath = join16(projectPath, entry.name);
+      const entryAbsPath = join17(projectPath, entry.name);
       if (entry.isFile() && MARKDOWN_EXTS.has(extname3(entry.name))) {
         nodes.push({
           id: entryRelPath,
@@ -11248,7 +11531,7 @@ async function buildAIFileTree(projectPath) {
 }
 function validateFilePath(projectPath, filePath) {
   if (!filePath) return null;
-  const abs = join16(projectPath, filePath);
+  const abs = join17(projectPath, filePath);
   if (!abs.startsWith(projectPath + "/") && abs !== projectPath) return null;
   return abs;
 }
@@ -11374,7 +11657,7 @@ async function handleSaveAIFile(c, projectManager) {
     if (!absPath) {
       return c.json({ error: { code: "BAD_REQUEST", message: "Invalid file path" } }, 400);
     }
-    const parentDir = join16(absPath, "..");
+    const parentDir = join17(absPath, "..");
     await mkdir(parentDir, { recursive: true });
     await writeFile2(absPath, content, "utf-8");
     return c.json({ success: true, path: filePath });
@@ -11474,10 +11757,10 @@ async function handleCreateSkill(c, projectManager) {
     if (!project) {
       return errorResponse(c, ErrorCodes.PROJECT_NOT_FOUND, `Project not found: ${projectId}`, 404);
     }
-    const skillRelPath = join16(".agents", "skills", name);
-    const skillAbsPath = join16(project.path, skillRelPath);
-    const skillFileRelPath = join16(skillRelPath, "SKILL.md");
-    const skillFileAbsPath = join16(skillAbsPath, "SKILL.md");
+    const skillRelPath = join17(".agents", "skills", name);
+    const skillAbsPath = join17(project.path, skillRelPath);
+    const skillFileRelPath = join17(skillRelPath, "SKILL.md");
+    const skillFileAbsPath = join17(skillAbsPath, "SKILL.md");
     if (existsSync11(skillAbsPath)) {
       return c.json(
         { error: { code: "CONFLICT", message: `Skill '${name}' already exists` } },
@@ -11579,7 +11862,7 @@ function createProjectRoutes(projectManager, threadManager) {
 
 // src/features/projects/projects.manager.ts
 init_utils();
-import { join as join19 } from "path";
+import { join as join20 } from "path";
 import { realpathSync as realpathSync2 } from "fs";
 import { rm as rm3 } from "fs/promises";
 
@@ -11800,13 +12083,13 @@ var ProcessManager = class extends EventEmitter {
 // src/features/projects/projects.creator.ts
 init_utils();
 import { randomUUID as randomUUID7 } from "crypto";
-import { basename as basename2, join as join18, relative as relative5 } from "path";
+import { basename as basename2, join as join19, relative as relative5 } from "path";
 import { access as access3, stat as stat3, readdir as readdir8 } from "fs/promises";
 
 // src/features/scaffold/scaffold.runner.ts
 init_utils();
 import { existsSync as existsSync12 } from "fs";
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 import { mkdir as mkdir2, readdir as readdir7, stat as stat2, rename, rm as rm2, writeFile as writeFile3 } from "fs/promises";
 import { createInterface as createInterface2 } from "readline";
 
@@ -12528,7 +12811,7 @@ function loadCatalog() {
 }
 async function writeAgentsMd(projectPath, agentsMd) {
   if (!agentsMd) return;
-  const agentsPath = join17(projectPath, "AGENTS.md");
+  const agentsPath = join18(projectPath, "AGENTS.md");
   if (existsSync12(agentsPath)) return;
   await writeFile3(agentsPath, agentsMd, "utf-8");
 }
@@ -12686,7 +12969,7 @@ async function* runCommandStreaming(cwd, command) {
   }
 }
 async function* createScaffoldedProjectStreaming(options) {
-  const projectPath = join17(options.parentDir, options.threadId);
+  const projectPath = join18(options.parentDir, options.threadId);
   if (!existsSync12(options.parentDir)) {
     yield {
       type: "result",
@@ -12776,7 +13059,7 @@ async function* createScaffoldedProjectStreaming(options) {
   }
   try {
     const projectName2 = getProjectName(options.projectName);
-    const projectSubDir = join17(projectPath, projectName2);
+    const projectSubDir = join18(projectPath, projectName2);
     try {
       const subDirStat = await stat2(projectSubDir);
       if (subDirStat.isDirectory()) {
@@ -12786,8 +13069,8 @@ async function* createScaffoldedProjectStreaming(options) {
         };
         const items = await readdir7(projectSubDir);
         for (const item of items) {
-          const oldPath = join17(projectSubDir, item);
-          const newPath = join17(projectPath, item);
+          const oldPath = join18(projectSubDir, item);
+          const newPath = join18(projectPath, item);
           await rename(oldPath, newPath);
         }
         await rm2(projectSubDir, { recursive: true, force: true });
@@ -13255,7 +13538,7 @@ var ProjectCreator = class {
     return name;
   }
   generateThreadPath(_projectId, threadId) {
-    return join18(this.rootFolder, threadId);
+    return join19(this.rootFolder, threadId);
   }
   async *createProjectFromFolder() {
     await loadUtils();
@@ -13405,19 +13688,19 @@ var ProjectCreator = class {
   }
   async findAllPackageJsonFiles(rootPath, currentPath, setupScripts) {
     try {
-      await access3(join18(currentPath, "package.json"));
+      await access3(join19(currentPath, "package.json"));
       const relativePath = relative5(rootPath, currentPath);
       let installCommand = "";
       try {
-        await access3(join18(currentPath, "yarn.lock"));
+        await access3(join19(currentPath, "yarn.lock"));
         installCommand = "yarn install";
       } catch {
         try {
-          await access3(join18(currentPath, "bun.lock"));
+          await access3(join19(currentPath, "bun.lock"));
           installCommand = "bun install";
         } catch {
           try {
-            await access3(join18(currentPath, "pnpm-lock.yaml"));
+            await access3(join19(currentPath, "pnpm-lock.yaml"));
             installCommand = "pnpm install";
           } catch {
             installCommand = "npm install";
@@ -13434,7 +13717,7 @@ var ProjectCreator = class {
     try {
       const entries = await readdir8(currentPath);
       for (const entry of entries) {
-        const entryPath = join18(currentPath, entry);
+        const entryPath = join19(currentPath, entry);
         try {
           const stats = await stat3(entryPath);
           if (stats.isDirectory() && !entry.startsWith(".") && entry !== "node_modules") {
@@ -13774,7 +14057,7 @@ var ProjectManagerImpl = class {
     const session = this.terminalSessionManager.getOrCreateSession(threadId, thread.path);
     let workingDir;
     if (cwd) {
-      workingDir = cwd.startsWith("/") ? cwd : join19(thread.path, cwd);
+      workingDir = cwd.startsWith("/") ? cwd : join20(thread.path, cwd);
       this.terminalSessionManager.updateWorkingDirectory(threadId, workingDir);
     } else {
       workingDir = session.currentWorkingDirectory;
@@ -13977,80 +14260,59 @@ ___CWD___%s
 // src/features/providers/providers.routes.ts
 import { Hono as Hono7 } from "hono";
 
-// src/core/env-manager.ts
-import { promises as fs } from "fs";
-import { join as join20 } from "path";
-async function updateEnvFile(keyNames) {
-  const envPath = join20(process.cwd(), ".env");
-  let content = "";
-  try {
-    content = await fs.readFile(envPath, "utf-8");
-  } catch {
-  }
-  const lines = content.split("\n");
-  const envMap = {};
-  for (const line of lines) {
-    const trimmed = line.trim();
-    if (trimmed && !trimmed.startsWith("#") && trimmed.includes("=")) {
-      const index = trimmed.indexOf("=");
-      const key = trimmed.substring(0, index).trim();
-      const value = trimmed.substring(index + 1).trim();
-      envMap[key] = value;
-    }
-  }
-  for (const [key, value] of Object.entries(keyNames)) {
-    if (key) {
-      envMap[key] = value;
-    }
-  }
-  const newLines = [];
-  for (const [key, value] of Object.entries(envMap)) {
-    newLines.push(`${key}=${value}`);
+// src/features/providers/providers-get.route.ts
+function getProviderApiKeyEnvName2(providerEnv) {
+  if (providerEnv.length === 0) {
+    return "";
   }
-  await fs.writeFile(envPath, newLines.join("\n") + "\n", "utf-8");
+  const explicitApiKeyEnv = providerEnv.find((envName) => /api_key$/i.test(envName));
+  return explicitApiKeyEnv ?? providerEnv[providerEnv.length - 1];
 }
-async function readEnvFile() {
-  const envPath = join20(process.cwd(), ".env");
-  const envMap = {};
-  try {
-    const content = await fs.readFile(envPath, "utf-8");
-    const lines = content.split("\n");
-    for (const line of lines) {
-      const trimmed = line.trim();
-      if (trimmed && !trimmed.startsWith("#") && trimmed.includes("=")) {
-        const index = trimmed.indexOf("=");
-        const key = trimmed.substring(0, index).trim();
-        const value = trimmed.substring(index + 1).trim();
-        envMap[key] = value;
-      }
-    }
-  } catch {
+function getProviderResourceName2(providerEnv) {
+  const explicitResourceEnv = providerEnv.find((envName) => /resource_name$/i.test(envName));
+  return explicitResourceEnv ?? providerEnv[0] ?? "";
+}
+function resolveAzureApiUrl2(providerEnv, envValues) {
+  const resourceEnvName = getProviderResourceName2(providerEnv);
+  const resourceName = envValues[resourceEnvName] ?? "";
+  if (!resourceName) {
+    return "";
   }
-  return envMap;
+  return `https://${resourceName}.openai.azure.com/openai/v1`;
 }
-
-// src/features/providers/providers-get.route.ts
 async function getProviders(c, metadataManager) {
   const keys = await metadataManager.getProviderKeys();
+  const persistedEnvValues = await metadataManager.getProviderEnvValues();
   const envFileKeys = await readEnvFile();
   const catalog = await getModelsCatalog();
   const providersWithKeys = [];
   if (catalog) {
     for (const [catalogId, catalogProvider] of Object.entries(catalog)) {
-      const keyName = catalogProvider.env?.[0] || "";
+      const envNames = catalogProvider.env ?? [];
+      const keyName = getProviderApiKeyEnvName2(envNames);
+      const envValues = {};
+      for (const envName of envNames) {
+        envValues[envName] = envFileKeys[envName] ?? process.env[envName] ?? persistedEnvValues[envName] ?? "";
+      }
       const envFileKey = keyName ? envFileKeys[keyName] : "";
       const processEnvKey = keyName ? process.env[keyName] : "";
       const storedKey = keys[catalogProvider.name] || keys[catalogId];
       const hasEnvKey = Boolean(envFileKey || processEnvKey);
       const resolvedKey = storedKey ?? envFileKey ?? processEnvKey ?? "";
       const isEnv = !storedKey && hasEnvKey && resolvedKey !== "";
+      const api = catalogId === "azure" ? resolveAzureApiUrl2(envNames, envValues) : catalogProvider.api ?? "";
+      if (keyName && !envValues[keyName]) {
+        envValues[keyName] = resolvedKey;
+      }
       providersWithKeys.push({
         name: catalogProvider.name ?? catalogId,
         slug: catalogId,
         url: catalogProvider.doc ?? "",
         keyName,
         authType: "APIKey",
-        api: catalogProvider.api ?? "",
+        api,
+        env: envNames,
+        envValues,
         apiKey: resolvedKey,
         isEnv
       });
@@ -14069,6 +14331,7 @@ async function postProviderKeys(c, metadataManager) {
     await metadataManager.saveProviderKey(providerName, apiKey);
     const keyName = await resolveProviderKeyName(providerName);
     if (keyName) {
+      updateRuntimeEnv({ [keyName]: apiKey });
       await updateEnvFile({ [keyName]: apiKey });
     }
     return c.json({ success: true });
@@ -14093,6 +14356,7 @@ async function postProviderBulkKeys(c, metadataManager) {
       }
     }
     if (Object.keys(envUpdates).length > 0) {
+      updateRuntimeEnv(envUpdates);
       await updateEnvFile(envUpdates);
     }
     return c.json({ success: true });
@@ -14101,6 +14365,28 @@ async function postProviderBulkKeys(c, metadataManager) {
   }
 }
 
+// src/features/providers/providers-post-env.route.ts
+async function postProviderEnv(c, metadataManager) {
+  try {
+    const { values } = await c.req.json();
+    if (!values || typeof values !== "object") {
+      return c.json({ error: "values object is required" }, 400);
+    }
+    const envValues = {};
+    for (const [key, value] of Object.entries(values)) {
+      if (typeof value === "string") {
+        envValues[key] = value;
+      }
+    }
+    await metadataManager.saveProviderEnvValues(envValues);
+    updateRuntimeEnv(envValues);
+    await updateEnvFile(envValues);
+    return c.json({ success: true });
+  } catch (error) {
+    return c.json({ error: `Failed to save provider environment: ${String(error)}` }, 500);
+  }
+}
+
 // src/features/models/model-info-openrouter.ts
 async function getOpenRouterCredits(apiKey) {
   try {
@@ -14196,13 +14482,24 @@ async function getProviderCredits(c, metadataManager) {
 // src/features/providers/providers-get-logo.route.ts
 var LOGO_BASE_URL = "https://models.tarsk.io/svg";
 var SLUG_PATTERN = /^[a-z0-9._-]+$/i;
+var logoCache = /* @__PURE__ */ new Map();
+var LOGO_CACHE_TTL_MS = 15 * 60 * 1e3;
 async function getProviderLogo(c) {
   const slug = c.req.param("slug");
   if (!slug || !SLUG_PATTERN.test(slug)) {
     return c.body(null, 404);
   }
+  const cached = logoCache.get(slug);
+  if (cached && Date.now() < cached.expires) {
+    return c.body(cached.svg, 200, {
+      "Content-Type": "image/svg+xml",
+      "Cache-Control": "public, max-age=86400"
+    });
+  }
   try {
-    const response = await fetch(`${LOGO_BASE_URL}/${slug}.svg`, { signal: AbortSignal.timeout(5e3) });
+    const response = await fetch(`${LOGO_BASE_URL}/${slug}.svg`, {
+      signal: AbortSignal.timeout(5e3)
+    });
     if (!response.ok) {
       return c.body(null, 404);
     }
@@ -14210,6 +14507,7 @@ async function getProviderLogo(c) {
     if (!svg.includes("<svg")) {
       return c.body(null, 404);
     }
+    logoCache.set(slug, { svg, expires: Date.now() + LOGO_CACHE_TTL_MS });
     return c.body(svg, 200, {
       "Content-Type": "image/svg+xml",
       "Cache-Control": "public, max-age=86400"
@@ -14262,6 +14560,7 @@ function createProviderRoutes(metadataManager) {
   router.get("/", (c) => getProviders(c, metadataManager));
   router.post("/keys", (c) => postProviderKeys(c, metadataManager));
   router.post("/bulk-keys", (c) => postProviderBulkKeys(c, metadataManager));
+  router.post("/env", (c) => postProviderEnv(c, metadataManager));
   router.get("/:name/credits", (c) => getProviderCredits(c, metadataManager));
   router.get("/:slug/logo", (c) => getProviderLogo(c));
   router.post("/open-external", (c) => openExternalUrl(c));
@@ -14512,7 +14811,7 @@ function createScaffoldRoutes(projectManager) {
 
 // src/features/slash-commands/slash-commands.manager.ts
 import { readdir as readdir9, readFile as readFile12, mkdir as mkdir3, writeFile as writeFile4, unlink as unlink2 } from "fs/promises";
-import { join as join21, basename as basename3, extname as extname4 } from "path";
+import { join as join21, basename as basename3, extname as extname4, relative as relative6 } from "path";
 import { existsSync as existsSync13 } from "fs";
 import { homedir as homedir7 } from "os";
 function slugify(filename) {
@@ -14593,14 +14892,14 @@ var SlashCommandManager = class _SlashCommandManager {
     const commands = /* @__PURE__ */ new Map();
     const globalDir = getGlobalCommandsDir();
     if (existsSync13(globalDir)) {
-      const globalCommands = await this.loadCommandsFromDir(globalDir, "global");
+      const globalCommands = await this.loadCommandsFromDir(globalDir, threadPath, "global");
       for (const cmd of globalCommands) {
         commands.set(cmd.name, cmd);
       }
     }
     const projectDir = getProjectCommandsDir(threadPath);
     if (existsSync13(projectDir)) {
-      const projectCommands = await this.loadCommandsFromDir(projectDir, "project");
+      const projectCommands = await this.loadCommandsFromDir(projectDir, threadPath, "project");
       for (const cmd of projectCommands) {
         if (!_SlashCommandManager.BUILT_IN_COMMANDS.has(cmd.name)) {
           commands.set(cmd.name, cmd);
@@ -14617,7 +14916,7 @@ var SlashCommandManager = class _SlashCommandManager {
   /**
    * Load commands from a specific directory
    */
-  async loadCommandsFromDir(dir, scope) {
+  async loadCommandsFromDir(dir, threadPath, scope) {
     const commands = [];
     try {
       const files = await readdir9(dir);
@@ -14634,7 +14933,7 @@ var SlashCommandManager = class _SlashCommandManager {
           content,
           metadata,
           scope,
-          filePath
+          filePath: scope === "project" ? relative6(threadPath, filePath) : filePath
         });
       }
     } catch (error) {
@@ -15855,7 +16154,7 @@ async function handleDeleteThread(c, threadManager) {
 // src/core/project-inspector.ts
 import { readFile as readFile13, readdir as readdir10 } from "fs/promises";
 import { existsSync as existsSync14 } from "fs";
-import { join as join23, basename as basename4, relative as relative6 } from "path";
+import { join as join23, basename as basename4, relative as relative7 } from "path";
 import { glob as glob2 } from "glob";
 
 // src/features/project-scripts/project-scripts.database.ts
@@ -16205,7 +16504,7 @@ function buildRunCommand(scriptName, workspace, packageManager, repoType, projec
     return `npm run ${scriptName} --workspace=${workspace.relativePath}`;
   }
   if (!isRoot) {
-    const relPath = relative6(projectPath, workspace.folder);
+    const relPath = relative7(projectPath, workspace.folder);
     return `cd ${relPath} && ${runCmd}`;
   }
   return runCmd;
@@ -17964,7 +18263,7 @@ import { completeSimple } from "@mariozechner/pi-ai";
 async function resolveModelAndKey(provider, modelId, metadataManager) {
   const providerConfig = await resolveProviderConfig(provider);
   if (!providerConfig) return null;
-  let apiKey = providerConfig.env && providerConfig.env.length > 0 ? process.env[providerConfig.env[0]] : void 0;
+  let apiKey = providerConfig.apiKeyEnv ? process.env[providerConfig.apiKeyEnv] : void 0;
   if (!apiKey) {
     const providerKeys = await metadataManager.getProviderKeys();
     apiKey = providerKeys[providerConfig.id];
@@ -19894,15 +20193,6 @@ async function gitSyncBranchHandler(c, metadataManager) {
         400
       );
     }
-    if (currentBranch === defaultBranch) {
-      console.log(`[sync-branch] Already on default branch: ${defaultBranch}`);
-      return c.json(
-        {
-          error: `Already on default branch (${defaultBranch})`
-        },
-        400
-      );
-    }
     const { spawnProcess: spawnProcess2 } = await Promise.resolve().then(() => (init_utils(), utils_exports));
     return new Promise((resolve6) => {
       console.log(`[sync-branch] Checking branch status...`);
@@ -20038,13 +20328,12 @@ async function gitSyncBranchHandler(c, metadataManager) {
           }
           pullProc.on("close", (code) => {
             if (code === 0) {
-              console.log(
-                `[sync-branch] \u2713 Successfully synced ${currentBranch} with ${defaultBranch}`
-              );
+              const message = currentBranch === defaultBranch ? `Successfully pulled latest changes from origin/${defaultBranch}` : `Successfully synced ${currentBranch} with ${defaultBranch}`;
+              console.log(`[sync-branch] \u2713 ${message}`);
               resolve6(
                 c.json({
                   success: true,
-                  message: `Successfully synced ${currentBranch} with ${defaultBranch}`,
+                  message,
                   branch: currentBranch,
                   defaultBranch
                 })
@@ -21204,7 +21493,7 @@ async function generateImage(c, metadataManager, conversationManager, threadMana
     if (!providerConfig) {
       return c.json({ error: `Unknown provider: ${provider}` }, 400);
     }
-    let apiKey = providerConfig.env && providerConfig.env.length > 0 ? process.env[providerConfig.env[0]] : void 0;
+    let apiKey = providerConfig.apiKeyEnv ? process.env[providerConfig.apiKeyEnv] : void 0;
     if (!apiKey) {
       const providerKeys = await metadataManager.getProviderKeys();
       apiKey = providerKeys[providerConfig.id];
@@ -21631,6 +21920,7 @@ async function startTarskServer(options) {
   const conversationManager = new ConversationManagerImpl(dataDir);
   const agentExecutor = new PiExecutorImpl(metadataManager);
   await metadataManager.initialize();
+  updateRuntimeEnv(await metadataManager.getProviderEnvValues());
   await conversationManager.initialize();
   app.get("/health", (c) => {
     return c.json({