@cremini/skillpack 1.2.0 → 1.2.1

package/dist/cli.js

@@ -9,89 +9,46 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// src/runtime/adapters/attachment-utils.ts
+// src/runtime/config.ts
 import fs5 from "fs";
 import path5 from "path";
-import { pipeline } from "stream/promises";
-import { Readable } from "stream";
-function getAttachmentDir(rootDir, channelId) {
-  return path5.resolve(rootDir, "data", "sessions", channelId, ATTACHMENTS_DIR);
-}
-function sanitizeFilename(name) {
-  return name.replace(/[/\\:*?"<>|]/g, "_").replace(/\s+/g, "_");
-}
-async function downloadAndSaveAttachment(rootDir, channelId, url, filename, mimeType, headers) {
-  const dir = getAttachmentDir(rootDir, channelId);
-  fs5.mkdirSync(dir, { recursive: true });
-  const ts = Date.now();
-  const safeName = sanitizeFilename(filename);
-  const storedName = `${ts}-${safeName}`;
-  const fullPath = path5.join(dir, storedName);
-  const response = await fetch(url, { headers });
-  if (!response.ok) {
-    throw new Error(
-      `Failed to download attachment from ${url}: ${response.status} ${response.statusText}`
-    );
-  }
-  const body = response.body;
-  if (!body) {
-    throw new Error(`Empty response body when downloading ${url}`);
-  }
-  const nodeStream = Readable.fromWeb(body);
-  const writeStream = fs5.createWriteStream(fullPath);
-  await pipeline(nodeStream, writeStream);
-  const stats = fs5.statSync(fullPath);
-  const detectedMime = mimeType || response.headers.get("content-type")?.split(";")[0] || void 0;
-  return {
-    filename,
-    localPath: fullPath,
-    mimeType: detectedMime,
-    size: stats.size
-  };
-}
-function isImageMime(mimeType) {
-  return !!mimeType && mimeType.startsWith("image/");
-}
-function formatSize(bytes) {
-  if (bytes === void 0 || bytes === null) return "";
-  if (bytes < 1024) return `${bytes}B`;
-  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)}KB`;
-  return `${(bytes / (1024 * 1024)).toFixed(1)}MB`;
-}
-function formatAttachmentsPrompt(attachments) {
-  if (attachments.length === 0) return "";
-  const lines = attachments.map((a) => {
-    const meta = [a.mimeType, formatSize(a.size)].filter(Boolean).join(", ");
-    return `- ${a.filename} (${meta}) \u2192 ${a.localPath}`;
-  });
-  return `[Attachments]
-${lines.join("\n")}`;
-}
-function attachmentsToImageContent(attachments) {
-  return attachments.filter((a) => isImageMime(a.mimeType)).map((a) => {
-    const buffer = fs5.readFileSync(a.localPath);
-    return {
-      type: "image",
-      data: buffer.toString("base64"),
-      mimeType: a.mimeType || "image/png"
-    };
-  });
-}
-var ATTACHMENTS_DIR;
-var init_attachment_utils = __esm({
-  "src/runtime/adapters/attachment-utils.ts"() {
-    "use strict";
-    ATTACHMENTS_DIR = "attachments";
-  }
-});
-
-// src/runtime/config.ts
-import fs8 from "fs";
-import path8 from "path";
-var ConfigManager, configManager;
+var SUPPORTED_PROVIDERS, ConfigManager, configManager, ConfigFileAuthBackend;
 var init_config = __esm({
   "src/runtime/config.ts"() {
     "use strict";
+    SUPPORTED_PROVIDERS = {
+      openai: {
+        label: "OpenAI",
+        defaultModelId: "gpt-5.4",
+        authType: "api_key",
+        envKey: "OPENAI_API_KEY",
+        placeholder: "sk-proj-...",
+        supportsBaseUrl: true
+      },
+      anthropic: {
+        label: "Anthropic",
+        defaultModelId: "claude-opus-4-6",
+        authType: "api_key",
+        envKey: "ANTHROPIC_API_KEY",
+        placeholder: "sk-ant-api03-...",
+        supportsBaseUrl: true
+      },
+      google: {
+        label: "Google (Gemini)",
+        defaultModelId: "gemini-2.5-pro",
+        authType: "api_key",
+        envKey: "GOOGLE_API_KEY",
+        placeholder: "AIza...",
+        supportsBaseUrl: false
+      },
+      "openai-codex": {
+        label: "OpenAI Codex",
+        defaultModelId: "gpt-5.4",
+        authType: "oauth",
+        oauthProviderId: "openai-codex",
+        supportsBaseUrl: false
+      }
+    };
     ConfigManager = class _ConfigManager {
       static instance;
       configData = {};
@@ -105,10 +62,10 @@ var init_config = __esm({
         return _ConfigManager.instance;
       }
       load(rootDir) {
-        this.configPath = path8.join(rootDir, "data", "config.json");
-        if (fs8.existsSync(this.configPath)) {
+        this.configPath = path5.join(rootDir, "data", "config.json");
+        if (fs5.existsSync(this.configPath)) {
           try {
-            this.configData = JSON.parse(fs8.readFileSync(this.configPath, "utf-8"));
+            this.configData = JSON.parse(fs5.readFileSync(this.configPath, "utf-8"));
             console.log("  Loaded config from data/config.json");
           } catch (err) {
             console.warn("  Warning: Failed to parse data/config.json:", err);
@@ -122,6 +79,9 @@ var init_config = __esm({
           } else if (process.env.ANTHROPIC_API_KEY) {
             apiKey = process.env.ANTHROPIC_API_KEY;
             provider = "anthropic";
+          } else if (process.env.GOOGLE_API_KEY) {
+            apiKey = process.env.GOOGLE_API_KEY;
+            provider = "google";
           }
         }
         this.configData.apiKey = apiKey;
@@ -133,12 +93,12 @@ var init_config = __esm({
         return this.configData;
       }
       save(rootDir, updates) {
-        const configDir = path8.join(rootDir, "data");
+        const configDir = path5.join(rootDir, "data");
         if (!this.configPath) {
-          this.configPath = path8.join(rootDir, "data", "config.json");
+          this.configPath = path5.join(rootDir, "data", "config.json");
         }
-        if (!fs8.existsSync(configDir)) {
-          fs8.mkdirSync(configDir, { recursive: true });
+        if (!fs5.existsSync(configDir)) {
+          fs5.mkdirSync(configDir, { recursive: true });
         }
         if (updates.apiKey !== void 0) this.configData.apiKey = updates.apiKey;
         if (updates.provider !== void 0) this.configData.provider = updates.provider;
@@ -160,7 +120,7 @@ var init_config = __esm({
           this.configData.scheduledJobs = updates.scheduledJobs;
         }
         try {
-          fs8.writeFileSync(
+          fs5.writeFileSync(
             this.configPath,
             JSON.stringify(this.configData, null, 2),
             "utf-8"
@@ -171,6 +131,137 @@ var init_config = __esm({
       }
     };
     configManager = ConfigManager.getInstance();
+    ConfigFileAuthBackend = class {
+      constructor(configPath) {
+        this.configPath = configPath;
+      }
+      ensureFile() {
+        const dir = path5.dirname(this.configPath);
+        if (!fs5.existsSync(dir)) {
+          fs5.mkdirSync(dir, { recursive: true });
+        }
+        if (!fs5.existsSync(this.configPath)) {
+          fs5.writeFileSync(this.configPath, "{}", "utf-8");
+        }
+      }
+      readAuthJson() {
+        this.ensureFile();
+        try {
+          const raw = fs5.readFileSync(this.configPath, "utf-8");
+          const config = JSON.parse(raw);
+          if (config._auth && typeof config._auth === "object") {
+            return JSON.stringify(config._auth);
+          }
+          return void 0;
+        } catch {
+          return void 0;
+        }
+      }
+      writeAuthJson(authJson) {
+        this.ensureFile();
+        try {
+          const raw = fs5.readFileSync(this.configPath, "utf-8");
+          const config = JSON.parse(raw);
+          config._auth = JSON.parse(authJson);
+          fs5.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8");
+        } catch {
+          const config = { _auth: JSON.parse(authJson) };
+          fs5.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8");
+        }
+      }
+      withLock(fn) {
+        const current = this.readAuthJson();
+        const { result, next } = fn(current);
+        if (next !== void 0) {
+          this.writeAuthJson(next);
+        }
+        return result;
+      }
+      async withLockAsync(fn) {
+        const current = this.readAuthJson();
+        const { result, next } = await fn(current);
+        if (next !== void 0) {
+          this.writeAuthJson(next);
+        }
+        return result;
+      }
+    };
+  }
+});
+
+// src/runtime/adapters/attachment-utils.ts
+import fs6 from "fs";
+import path6 from "path";
+import { pipeline } from "stream/promises";
+import { Readable } from "stream";
+function getAttachmentDir(rootDir, channelId) {
+  return path6.resolve(rootDir, "data", "sessions", channelId, ATTACHMENTS_DIR);
+}
+function sanitizeFilename(name) {
+  return name.replace(/[/\\:*?"<>|]/g, "_").replace(/\s+/g, "_");
+}
+async function downloadAndSaveAttachment(rootDir, channelId, url, filename, mimeType, headers) {
+  const dir = getAttachmentDir(rootDir, channelId);
+  fs6.mkdirSync(dir, { recursive: true });
+  const ts = Date.now();
+  const safeName = sanitizeFilename(filename);
+  const storedName = `${ts}-${safeName}`;
+  const fullPath = path6.join(dir, storedName);
+  const response = await fetch(url, { headers });
+  if (!response.ok) {
+    throw new Error(
+      `Failed to download attachment from ${url}: ${response.status} ${response.statusText}`
+    );
+  }
+  const body = response.body;
+  if (!body) {
+    throw new Error(`Empty response body when downloading ${url}`);
+  }
+  const nodeStream = Readable.fromWeb(body);
+  const writeStream = fs6.createWriteStream(fullPath);
+  await pipeline(nodeStream, writeStream);
+  const stats = fs6.statSync(fullPath);
+  const detectedMime = mimeType || response.headers.get("content-type")?.split(";")[0] || void 0;
+  return {
+    filename,
+    localPath: fullPath,
+    mimeType: detectedMime,
+    size: stats.size
+  };
+}
+function isImageMime(mimeType) {
+  return !!mimeType && mimeType.startsWith("image/");
+}
+function formatSize(bytes) {
+  if (bytes === void 0 || bytes === null) return "";
+  if (bytes < 1024) return `${bytes}B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)}KB`;
+  return `${(bytes / (1024 * 1024)).toFixed(1)}MB`;
+}
+function formatAttachmentsPrompt(attachments) {
+  if (attachments.length === 0) return "";
+  const lines = attachments.map((a) => {
+    const meta = [a.mimeType, formatSize(a.size)].filter(Boolean).join(", ");
+    return `- ${a.filename} (${meta}) \u2192 ${a.localPath}`;
+  });
+  return `[Attachments]
+${lines.join("\n")}`;
+}
+function attachmentsToImageContent(attachments) {
+  return attachments.filter((a) => isImageMime(a.mimeType)).map((a) => {
+    const buffer = fs6.readFileSync(a.localPath);
+    return {
+      type: "image",
+      data: buffer.toString("base64"),
+      mimeType: a.mimeType || "image/png"
+    };
+  });
+}
+var ATTACHMENTS_DIR;
+var init_attachment_utils = __esm({
+  "src/runtime/adapters/attachment-utils.ts"() {
+    "use strict";
+    ATTACHMENTS_DIR = "attachments";
   }
 });
 
@@ -2057,9 +2148,10 @@ import { createServer } from "http";
 import { exec } from "child_process";
 
 // src/runtime/agent.ts
+init_config();
 init_attachment_utils();
-import path7 from "path";
-import fs7 from "fs";
+import path8 from "path";
+import fs8 from "fs";
 import { fileURLToPath } from "url";
 import {
   AuthStorage,
@@ -2071,8 +2163,8 @@ import {
 } from "@mariozechner/pi-coding-agent";
 
 // src/runtime/tools/send-file-tool.ts
-import fs6 from "fs";
-import path6 from "path";
+import fs7 from "fs";
+import path7 from "path";
 
 // node_modules/@sinclair/typebox/build/esm/type/guard/value.mjs
 var value_exports = {};
@@ -4712,7 +4804,7 @@ var MIME_BY_EXT = {
   ".ogg": "audio/ogg"
 };
 function detectMimeType(filePath) {
-  const ext = path6.extname(filePath).toLowerCase();
+  const ext = path7.extname(filePath).toLowerCase();
   return MIME_BY_EXT[ext];
 }
 function createSendFileTool(fileOutputCallbackRef) {
@@ -4724,13 +4816,13 @@ function createSendFileTool(fileOutputCallbackRef) {
     parameters: SendFileParams,
     async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
       const { filePath, caption } = params;
-      if (!fs6.existsSync(filePath)) {
+      if (!fs7.existsSync(filePath)) {
         return {
           content: [{ type: "text", text: `Error: File not found: ${filePath}` }],
           details: void 0
         };
       }
-      const stats = fs6.statSync(filePath);
+      const stats = fs7.statSync(filePath);
       if (!stats.isFile()) {
         return {
           content: [
@@ -4739,7 +4831,7 @@ function createSendFileTool(fileOutputCallbackRef) {
           details: void 0
         };
       }
-      const filename = path6.basename(filePath);
+      const filename = path7.basename(filePath);
       const mimeType = detectMimeType(filePath);
       const callback = fileOutputCallbackRef.current;
       if (callback) {
@@ -4925,24 +5017,24 @@ var BUILTIN_SKILL_CREATOR_TEMPLATE_DIR = fileURLToPath(
   new URL("../templates/builtin-skills/skill-creator", import.meta.url)
 );
 function materializeBuiltinSkillCreator(rootDir, skillsPath) {
-  if (!fs7.existsSync(BUILTIN_SKILL_CREATOR_TEMPLATE_DIR)) {
+  if (!fs8.existsSync(BUILTIN_SKILL_CREATOR_TEMPLATE_DIR)) {
     log(
       `[PackAgent] Built-in skill-creator template missing: ${BUILTIN_SKILL_CREATOR_TEMPLATE_DIR}`
     );
     return null;
   }
-  const packConfigPath = path7.resolve(rootDir, "skillpack.json");
-  const skillDir = path7.resolve(skillsPath, BUILTIN_SKILL_CREATOR_NAME);
-  const skillPath = path7.join(skillDir, "SKILL.md");
+  const packConfigPath = path8.resolve(rootDir, "skillpack.json");
+  const skillDir = path8.resolve(skillsPath, BUILTIN_SKILL_CREATOR_NAME);
+  const skillPath = path8.join(skillDir, "SKILL.md");
   const renderTemplate = (content) => content.replaceAll("{{SKILLS_PATH}}", skillsPath).replaceAll("{{PACK_CONFIG_PATH}}", packConfigPath);
   const copyDir = (srcDir, destDir) => {
-    fs7.mkdirSync(destDir, { recursive: true });
-    for (const entry of fs7.readdirSync(srcDir, { withFileTypes: true })) {
+    fs8.mkdirSync(destDir, { recursive: true });
+    for (const entry of fs8.readdirSync(srcDir, { withFileTypes: true })) {
       if (entry.name === ".DS_Store") {
         continue;
       }
-      const srcPath = path7.join(srcDir, entry.name);
-      const destPath = path7.join(destDir, entry.name);
+      const srcPath = path8.join(srcDir, entry.name);
+      const destPath = path8.join(destDir, entry.name);
       if (entry.isDirectory()) {
         copyDir(srcPath, destPath);
         continue;
@@ -4951,17 +5043,17 @@ function materializeBuiltinSkillCreator(rootDir, skillsPath) {
         continue;
       }
       if (entry.name.endsWith(".md") || entry.name.endsWith(".py")) {
-        const content = fs7.readFileSync(srcPath, "utf-8");
-        fs7.writeFileSync(destPath, renderTemplate(content), "utf-8");
+        const content = fs8.readFileSync(srcPath, "utf-8");
+        fs8.writeFileSync(destPath, renderTemplate(content), "utf-8");
         continue;
       }
-      fs7.copyFileSync(srcPath, destPath);
+      fs8.copyFileSync(srcPath, destPath);
     }
   };
-  if (!fs7.existsSync(skillDir)) {
+  if (!fs8.existsSync(skillDir)) {
     copyDir(BUILTIN_SKILL_CREATOR_TEMPLATE_DIR, skillDir);
   }
-  if (!fs7.existsSync(skillPath)) {
+  if (!fs8.existsSync(skillPath)) {
     log(
       `[PackAgent] Materialized built-in skill-creator but SKILL.md is missing: ${skillPath}`
     );
@@ -5014,8 +5106,29 @@ var PackAgent = class {
     current: null
   };
   schedulerRef = { current: null };
+  authStorage;
   constructor(options) {
     this.options = options;
+    const configPath = path8.resolve(options.rootDir, "data", "config.json");
+    const backend = new ConfigFileAuthBackend(configPath);
+    this.authStorage = AuthStorage.fromStorage(backend);
+    const providerMeta = SUPPORTED_PROVIDERS[options.provider];
+    if (providerMeta?.authType === "api_key" && options.apiKey) {
+      this.authStorage.setRuntimeApiKey(options.provider, options.apiKey);
+    }
+  }
+  /** Get the shared AuthStorage instance (used by OAuth API endpoints) */
+  getAuthStorage() {
+    return this.authStorage;
+  }
+  /** Update runtime auth when provider/apiKey changes */
+  updateAuth(provider, apiKey) {
+    this.authStorage.removeRuntimeApiKey(this.options.provider);
+    this.options.provider = provider;
+    if (apiKey) {
+      this.options.apiKey = apiKey;
+      this.authStorage.setRuntimeApiKey(provider, apiKey);
+    }
   }
   /**
    * Inject scheduler reference (called by server.ts after adapter init).
@@ -5039,35 +5152,32 @@ var PackAgent = class {
     const pendingCreation = this.pendingSessionCreations.get(channelId);
     if (pendingCreation) return pendingCreation;
     const createSessionPromise = (async () => {
-      const { apiKey, rootDir, provider, modelId, baseUrl } = this.options;
-      const authStorage = AuthStorage.inMemory({
-        [provider]: { type: "api_key", key: apiKey }
-      });
-      authStorage.setRuntimeApiKey(provider, apiKey);
+      const { rootDir, provider, modelId, baseUrl } = this.options;
+      const authStorage = this.authStorage;
       const modelRegistry = new ModelRegistry(authStorage);
       const resolvedModel = modelRegistry.find(provider, modelId);
       const model = resolvedModel && baseUrl ? { ...resolvedModel, baseUrl } : resolvedModel;
       if (resolvedModel && baseUrl) {
         log(`[PackAgent] Overriding ${provider}/${modelId} baseUrl -> ${baseUrl}`);
       }
-      const sessionDir = path7.resolve(
+      const sessionDir = path8.resolve(
         rootDir,
         "data",
         "sessions",
         channelId
       );
-      fs7.mkdirSync(sessionDir, { recursive: true });
+      fs8.mkdirSync(sessionDir, { recursive: true });
       const sessionManager = SessionManager.continueRecent(rootDir, sessionDir);
       log(`[PackAgent] Session dir: ${sessionDir}`);
-      const workspaceDir = path7.resolve(
+      const workspaceDir = path8.resolve(
         rootDir,
         "data",
         "workspaces",
         channelId
       );
-      fs7.mkdirSync(workspaceDir, { recursive: true });
+      fs8.mkdirSync(workspaceDir, { recursive: true });
       log(`[PackAgent] Workspace dir: ${workspaceDir}`);
-      const skillsPath = path7.resolve(rootDir, "skills");
+      const skillsPath = path8.resolve(rootDir, "skills");
       log(`[PackAgent] Loading skills from: ${skillsPath}`);
       const materializedSkillCreator = materializeBuiltinSkillCreator(
         rootDir,
@@ -5249,9 +5359,9 @@ ${text}`;
           this.channels.delete(channelId);
         }
         const { rootDir } = this.options;
-        const sessionDir = path7.resolve(rootDir, "data", "sessions", channelId);
-        if (fs7.existsSync(sessionDir)) {
-          fs7.rmSync(sessionDir, { recursive: true, force: true });
+        const sessionDir = path8.resolve(rootDir, "data", "sessions", channelId);
+        if (fs8.existsSync(sessionDir)) {
+          fs8.rmSync(sessionDir, { recursive: true, force: true });
           log(`[PackAgent] Cleared session dir: ${sessionDir}`);
         }
         return {
@@ -5340,6 +5450,9 @@ var WebAdapter = class {
     app.get("/api/config", (_req, res) => {
       const config = getPackConfig(rootDir);
       const conf = configManager.getConfig();
+      const currentProvider2 = conf.provider || "openai";
+      const providerMeta = SUPPORTED_PROVIDERS[currentProvider2];
+      const oauthConnected = providerMeta?.authType === "oauth" ? agent.getAuthStorage().hasAuth(currentProvider2) : false;
       res.json({
         name: config.name,
         description: config.description,
@@ -5347,9 +5460,11 @@ var WebAdapter = class {
         skills: config.skills || [],
         hasApiKey: !!conf.apiKey,
         apiKey: conf.apiKey || "",
-        provider: conf.provider || "openai",
+        provider: currentProvider2,
         baseUrl: conf.baseUrl || "",
-        adapters: conf.adapters || {}
+        adapters: conf.adapters || {},
+        supportedProviders: SUPPORTED_PROVIDERS,
+        oauthConnected
       });
     });
     app.get("/api/skills", (_req, res) => {
@@ -5375,16 +5490,62 @@ var WebAdapter = class {
         updates.adapters = adapters;
       }
       configManager.save(rootDir, updates);
-      const newConf = configManager.getConfig();
-      const requiresRestart = getRuntimeConfigSignature(beforeConfig) !== getRuntimeConfigSignature(newConf);
+      agent.updateAuth(currentProvider, apiKey);
+      const afterConfig = configManager.getConfig();
+      const requiresRestart = getRuntimeConfigSignature(beforeConfig) !== getRuntimeConfigSignature(afterConfig);
       res.json({
-        success: true,
-        provider: newConf.provider,
-        baseUrl: newConf.baseUrl || "",
-        adapters: newConf.adapters,
+        ...afterConfig,
         requiresRestart
       });
     });
+    app.post("/api/oauth/login", async (req, res) => {
+      const { provider } = req.body;
+      const meta = SUPPORTED_PROVIDERS[provider];
+      if (!meta || meta.authType !== "oauth") {
+        return res.status(400).json({ error: "Provider does not support OAuth" });
+      }
+      try {
+        const authStorage = agent.getAuthStorage();
+        let authUrl = "";
+        const loginPromise = authStorage.login(provider, {
+          onAuth: (info) => {
+            authUrl = info.url;
+          },
+          onPrompt: async (prompt) => {
+            return "";
+          },
+          onProgress: (msg) => {
+            console.log(`[OAuth] ${provider} login progress: ${msg}`);
+          }
+        });
+        await new Promise((r) => setTimeout(r, 1500));
+        if (authUrl) {
+          res.json({ status: "pending", authUrl });
+        } else {
+          res.json({ status: "pending" });
+        }
+        loginPromise.catch((err) => {
+          console.error(`[OAuth] ${provider} login error:`, err);
+        });
+      } catch (err) {
+        res.status(500).json({ error: String(err) });
+      }
+    });
+    app.get("/api/oauth/status", (_req, res) => {
+      const conf = configManager.getConfig();
+      const provider = conf.provider || "openai";
+      const meta = SUPPORTED_PROVIDERS[provider];
+      if (!meta || meta.authType !== "oauth") {
+        return res.json({ connected: false });
+      }
+      const connected = agent.getAuthStorage().hasAuth(provider);
+      res.json({ connected, provider });
+    });
+    app.post("/api/oauth/logout", (req, res) => {
+      const { provider } = req.body;
+      agent.getAuthStorage().logout(provider);
+      res.json({ success: true });
+    });
     app.post("/api/runtime/restart", async (_req, res) => {
       const result = await lifecycle.requestRestart("web");
       res.status(202).json(result);
@@ -5508,8 +5669,10 @@ var WebAdapter = class {
         `http://${request.headers.host || "127.0.0.1"}`
       );
       const _reqProvider = url.searchParams.get("provider") || currentProvider;
-      if (!apiKey) {
-        ws.send(JSON.stringify({ error: "Please set an API key first" }));
+      const providerMeta = SUPPORTED_PROVIDERS[_reqProvider];
+      const hasAuth = providerMeta?.authType === "oauth" ? agent.getAuthStorage().hasAuth(_reqProvider) : !!apiKey;
+      if (!hasAuth) {
+        ws.send(JSON.stringify({ error: "Please configure authentication first" }));
         ws.close();
         return;
       }
@@ -5819,7 +5982,7 @@ async function startServer(options) {
   const canonicalRootDir = canonicalizeDir(rootDir);
   const packConfig = loadConfig(canonicalRootDir);
   const baseUrl = dataConfig.baseUrl?.trim() || void 0;
-  const modelId = provider === "anthropic" ? "claude-opus-4-6" : "gpt-5.4";
+  const modelId = SUPPORTED_PROVIDERS[provider]?.defaultModelId ?? SUPPORTED_PROVIDERS.openai.defaultModelId;
   const packageRoot = path12.resolve(__dirname, "..");
   const webDir = fs13.existsSync(path12.join(rootDir, "web")) ? path12.join(rootDir, "web") : path12.join(packageRoot, "web");
   const app = express();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cremini/skillpack",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Pack AI Skills into Local Agents",
   "type": "module",
   "repository": {

package/web/index.html

@@ -39,12 +39,6 @@
         <ul id="skills-list"></ul>
       </div>
 
-      <div class="sidebar-settings-section">
-        <button id="open-settings-btn" class="settings-trigger-btn">
-          <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="btn-icon"><circle cx="12" cy="12" r="3"></circle><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"></path></svg>
-          Settings
-        </button>
-      </div>
     </aside>
 
     <main id="chat-area" class="mode-welcome">
@@ -71,59 +65,6 @@
     </main>
   </div>
 
-  <!-- Settings Dialog -->
-  <dialog id="settings-dialog" class="settings-modal">
-    <div class="settings-modal-header">
-      <h2>Settings</h2>
-      <button id="close-settings-btn" class="close-btn" aria-label="Close">
-         <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"></line><line x1="6" y1="6" x2="18" y2="18"></line></svg>
-      </button>
-    </div>
-    <div class="settings-modal-body">
-      <div class="settings-sections">
-        <!-- General Section -->
-        <div class="settings-section">
-          <h3 class="section-title">General</h3>
-          <div class="form-group">
-            <label>Provider</label>
-            <div class="provider-select-wrapper">
-              <select id="provider-select">
-                <option value="openai">OpenAI</option>
-                <option value="anthropic">Anthropic</option>
-              </select>
-            </div>
-          </div>
-          <div class="form-group">
-            <label>API Key</label>
-            <input type="password" id="api-key-input" placeholder="sk-..." class="form-input" />
-          </div>
-        </div>
-
-        <!-- IM Bots Section -->
-        <div class="settings-section">
-          <h3 class="section-title">IM Bots</h3>
-          <div class="form-group">
-            <label>Telegram Bot Token</label>
-            <input type="password" id="telegram-token-input" placeholder="123456:ABC-DEF..." class="form-input" />
-          </div>
-          <div class="form-group">
-            <label>Slack Bot Token</label>
-            <input type="password" id="slack-bot-token-input" placeholder="xoxb-..." class="form-input" />
-          </div>
-          <div class="form-group">
-            <label>Slack App Token</label>
-            <input type="password" id="slack-app-token-input" placeholder="xapp-..." class="form-input" />
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="settings-modal-footer">
-      <p id="key-status" class="status-text"></p>
-      <button id="restart-service-btn" class="secondary-btn" hidden>Restart Service</button>
-      <button id="save-settings-btn" class="primary-btn">Save Settings</button>
-    </div>
-  </dialog>
-
   <!-- API Key Dialog -->
   <dialog id="apikey-dialog" class="settings-modal compact-modal">
     <div class="settings-modal-header">
@@ -140,12 +81,38 @@
             <select id="apikey-provider-select">
               <option value="openai">OpenAI</option>
               <option value="anthropic">Anthropic</option>
+              <option value="google">Google (Gemini)</option>
+              <option value="openai-codex">OpenAI Codex</option>
             </select>
           </div>
         </div>
-        <div class="form-group">
-          <label>API Key</label>
-          <input type="password" id="apikey-input" placeholder="sk-..." class="form-input" />
+        <!-- API Key Section -->
+        <div id="apikey-apikey-section">
+          <div class="form-group">
+            <label>API Key</label>
+            <input type="password" id="apikey-input" placeholder="sk-..." class="form-input" />
+          </div>
+          <div class="form-group" id="apikey-baseurl-group">
+            <label>Custom Base URL <span class="label-hint">(optional)</span></label>
+            <input type="text" id="apikey-baseurl-input" placeholder="https://api.example.com/v1" class="form-input" />
+          </div>
+        </div>
+
+        <!-- OAuth Section -->
+        <div id="apikey-oauth-section" style="display: none;">
+          <div class="oauth-status-card">
+            <div id="oauth-status-indicator" class="oauth-disconnected">
+              <span class="oauth-status-dot"></span>
+              <span id="oauth-status-text">Not Connected</span>
+            </div>
+            <p class="oauth-hint">Login with your ChatGPT account to use Codex subscription.</p>
+          </div>
+          <button id="oauth-login-btn" class="primary-btn oauth-btn">
+            Login with ChatGPT
+          </button>
+          <button id="oauth-logout-btn" class="secondary-btn oauth-btn" style="display: none;">
+            Logout
+          </button>
         </div>
       </div>
     </div>

package/web/js/api-key-dialog.js

@@ -1,8 +1,7 @@
 /**
  * API Key Dialog Module
  * 
- * 负责 Model API Key 的配置管理。
- * 独立的 Dialog，从原 SettingDialog 的 API Key 部分拆分出来。
+ * 负责 Model 认证配置管理。支持 API Key 模式和 OAuth 模式切换。
  */
 import { state } from "./config.js";
 import { saveConfigData, restartRuntime } from "./api.js";
@@ -15,6 +14,14 @@ let saveBtn;
 let restartBtn;
 let providerSelect;
 let apiKeyInput;
+let baseUrlInput;
+let baseUrlGroup;
+let apikeySection;
+let oauthSection;
+let oauthLoginBtn;
+let oauthLogoutBtn;
+let oauthStatusIndicator;
+let oauthStatusText;
 let statusEl;
 
 // --- Public API ---
@@ -27,6 +34,14 @@ export function initApiKeyDialog() {
   restartBtn = document.getElementById("restart-apikey-btn");
   providerSelect = document.getElementById("apikey-provider-select");
   apiKeyInput = document.getElementById("apikey-input");
+  baseUrlInput = document.getElementById("apikey-baseurl-input");
+  baseUrlGroup = document.getElementById("apikey-baseurl-group");
+  apikeySection = document.getElementById("apikey-apikey-section");
+  oauthSection = document.getElementById("apikey-oauth-section");
+  oauthLoginBtn = document.getElementById("oauth-login-btn");
+  oauthLogoutBtn = document.getElementById("oauth-logout-btn");
+  oauthStatusIndicator = document.getElementById("oauth-status-indicator");
+  oauthStatusText = document.getElementById("oauth-status-text");
   statusEl = document.getElementById("apikey-status");
 
   if (!dialog) return;
@@ -44,7 +59,13 @@ export function initApiKeyDialog() {
     restartBtn.addEventListener("click", handleRestart);
   }
   if (providerSelect) {
-    providerSelect.addEventListener("change", updatePlaceholder);
+    providerSelect.addEventListener("change", updateProviderUI);
+  }
+  if (oauthLoginBtn) {
+    oauthLoginBtn.addEventListener("click", handleOAuthLogin);
+  }
+  if (oauthLogoutBtn) {
+    oauthLogoutBtn.addEventListener("click", handleOAuthLogout);
   }
 }
 
@@ -54,12 +75,19 @@ export function initApiKeyDialog() {
 export function updateApiKeyButton() {
   if (!openBtn) return;
   const config = state.config;
-  if (config && config.hasApiKey) {
+  const currentProvider = config?.provider || "openai";
+  const meta = config?.supportedProviders?.[currentProvider];
+  
+  const connected = meta?.authType === "oauth" 
+    ? config?.oauthConnected 
+    : config?.hasApiKey;
+
+  if (connected) {
     openBtn.classList.add("connected");
-    openBtn.querySelector(".action-btn-label").textContent = "API Key Configured";
+    openBtn.querySelector(".action-btn-label").textContent = "Model Configured";
   } else {
     openBtn.classList.remove("connected");
-    openBtn.querySelector(".action-btn-label").textContent = "Provide Model API Key";
+    openBtn.querySelector(".action-btn-label").textContent = "Provide Model Auth";
   }
 }
 
@@ -83,10 +111,11 @@ function populateForm() {
   if (config.provider && providerSelect) {
     providerSelect.value = config.provider;
   }
-  updatePlaceholder();
+  updateProviderUI();
 
   setStatus("", "");
 
+  // API Key & BaseURL
   if (config.hasApiKey && config.apiKey) {
     apiKeyInput.value = config.apiKey;
   } else if (config.hasApiKey) {
@@ -94,27 +123,64 @@ function populateForm() {
   } else {
     apiKeyInput.value = "";
   }
+  if (baseUrlInput) {
+    baseUrlInput.value = config.baseUrl || "";
+  }
+
+  // OAuth Status
+  if (config.oauthConnected) {
+    updateOAuthUI(true);
+  } else {
+    updateOAuthUI(false);
+  }
 }
 
-function updatePlaceholder() {
-  if (!providerSelect || !apiKeyInput) return;
+function updateProviderUI() {
+  if (!providerSelect) return;
   const p = providerSelect.value;
-  if (p === "openai") apiKeyInput.placeholder = "sk-proj-...";
-  else if (p === "anthropic") apiKeyInput.placeholder = "sk-ant-api03-...";
-  else apiKeyInput.placeholder = "sk-...";
+  const meta = state.config?.supportedProviders?.[p];
+  
+  if (!meta) return;
+
+  if (meta.authType === "oauth") {
+    // Show OAuth section, hide API Key section
+    if (apikeySection) apikeySection.style.display = "none";
+    if (oauthSection) oauthSection.style.display = "";
+    if (saveBtn) saveBtn.style.display = "none";
+    checkOAuthStatus();
+  } else {
+    // Show API Key section, hide OAuth section
+    if (apikeySection) apikeySection.style.display = "";
+    if (oauthSection) oauthSection.style.display = "none";
+    if (saveBtn) saveBtn.style.display = "";
+    
+    // Toggle BaseURL input
+    if (baseUrlGroup) {
+      baseUrlGroup.style.display = meta.supportsBaseUrl ? "" : "none";
+    }
+    
+    // Update placeholder
+    if (apiKeyInput) {
+      apiKeyInput.placeholder = meta.placeholder || "sk-...";
+    }
+  }
 }
 
 async function handleSave() {
   const key = apiKeyInput.value.trim();
   const provider = providerSelect.value;
+  const baseUrl = baseUrlInput.value.trim();
 
-  if (!key) {
-    setStatus("Please enter an API key", "error");
-    return;
-  }
+  // If OAuth is selected, we don't handle it here but it shouldn't happen as save button is hidden
+  const meta = state.config?.supportedProviders?.[provider];
+  if (meta?.authType === "oauth") return;
 
   const updates = { provider };
-  if (key !== "***************************************************" && key !== state.config.apiKey) {
+  if (baseUrl !== state.config.baseUrl) {
+    updates.baseUrl = baseUrl;
+  }
+  
+  if (key && key !== "***************************************************" && key !== state.config.apiKey) {
     updates.key = key;
   }
 
@@ -123,33 +189,21 @@ async function handleSave() {
     const res = await saveConfigData(updates);
 
     state.config.provider = res.provider;
+    state.config.baseUrl = res.baseUrl || "";
     if (updates.key) {
       state.config.hasApiKey = true;
       state.config.apiKey = updates.key;
     }
     
-    if (state.config.hasApiKey && state.config.apiKey) {
-      apiKeyInput.value = state.config.apiKey;
-    } else if (state.config.hasApiKey) {
-      apiKeyInput.value = "***************************************************";
-    } else {
-      apiKeyInput.value = "";
-    }
-    
-
+    populateForm();
     state.restartRequired = !!res.requiresRestart;
-
     updateApiKeyButton();
 
     if (res.requiresRestart) {
-      setStatus(
-        "API key saved. Restart service to apply changes.",
-        "warning",
-      );
+      setStatus("Settings saved. Restart service to apply changes.", "warning");
       updateRestartButton(true);
     } else {
-      setStatus("API key saved successfully", "success");
-      // 延迟关闭让用户看到成功消息
+      setStatus("Settings saved successfully", "success");
       setTimeout(() => close(), 1200);
     }
   } catch (err) {
@@ -159,6 +213,107 @@ async function handleSave() {
   }
 }
 
+async function handleOAuthLogin() {
+  const provider = providerSelect.value;
+  oauthLoginBtn.disabled = true;
+  setStatus("Starting OAuth login...", "warning");
+
+  try {
+    // Ensure provider is saved first
+    await saveConfigData({ provider });
+    
+    const res = await fetch("/api/oauth/login", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ provider }),
+    });
+    const data = await res.json();
+
+    if (data.authUrl) {
+      window.open(data.authUrl, "_blank");
+      setStatus("Waiting for authorization in browser...", "warning");
+      pollOAuthStatus();
+    } else {
+      setStatus("OAuth process started. Check terminal for URL if browser didn't open.", "warning");
+      pollOAuthStatus();
+    }
+  } catch (err) {
+    setStatus("Login failed: " + err.message, "error");
+    oauthLoginBtn.disabled = false;
+  }
+}
+
+async function handleOAuthLogout() {
+  const provider = providerSelect.value;
+  try {
+    await fetch("/api/oauth/logout", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ provider }),
+    });
+    updateOAuthUI(false);
+    state.config.oauthConnected = false;
+    updateApiKeyButton();
+    setStatus("Logged out successfully", "success");
+  } catch (err) {
+    setStatus("Logout failed: " + err.message, "error");
+  }
+}
+
+async function checkOAuthStatus() {
+  try {
+    const res = await fetch("/api/oauth/status");
+    const { connected } = await res.json();
+    updateOAuthUI(connected);
+    state.config.oauthConnected = connected;
+    updateApiKeyButton();
+  } catch (err) {
+    console.error("Failed to check OAuth status:", err);
+  }
+}
+
+function pollOAuthStatus() {
+  const interval = setInterval(async () => {
+    const res = await fetch("/api/oauth/status");
+    const { connected } = await res.json();
+    if (connected) {
+      clearInterval(interval);
+      updateOAuthUI(true);
+      state.config.oauthConnected = true;
+      state.restartRequired = true;
+      updateApiKeyButton();
+      setStatus("Connected successfully!", "success");
+      updateRestartButton(true);
+    }
+  }, 2000);
+  
+  // Timeout after 5 minutes
+  setTimeout(() => clearInterval(interval), 300000);
+}
+
+function updateOAuthUI(connected) {
+  if (connected) {
+    if (oauthStatusIndicator) {
+      oauthStatusIndicator.classList.remove("oauth-disconnected");
+      oauthStatusIndicator.classList.add("oauth-connected");
+    }
+    if (oauthStatusText) oauthStatusText.textContent = "Connected";
+    if (oauthLoginBtn) oauthLoginBtn.style.display = "none";
+    if (oauthLogoutBtn) oauthLogoutBtn.style.display = "";
+  } else {
+    if (oauthStatusIndicator) {
+      oauthStatusIndicator.classList.add("oauth-disconnected");
+      oauthStatusIndicator.classList.remove("oauth-connected");
+    }
+    if (oauthStatusText) oauthStatusText.textContent = "Not Connected";
+    if (oauthLoginBtn) {
+      oauthLoginBtn.style.display = "";
+      oauthLoginBtn.disabled = false;
+    }
+    if (oauthLogoutBtn) oauthLogoutBtn.style.display = "none";
+  }
+}
+
 async function handleRestart() {
   if (!restartBtn) return;
 

package/web/js/main.js

@@ -1,5 +1,4 @@
 import { state, loadConfig } from "./config.js";
-import { initSettings } from "./settings.js";
 import { initApiKeyDialog, updateApiKeyButton } from "./api-key-dialog.js";
 import { initChatAppsDialog, updateChatAppsButton } from "./chat-apps-dialog.js";
 import { initChat, showWelcome } from "./chat.js";
@@ -42,7 +41,6 @@ async function init() {
   }
   
   // Initialize all dialog modules
-  initSettings();
   initApiKeyDialog();
   initChatAppsDialog();
   initChat();

package/web/styles.css

@@ -72,13 +72,6 @@ body {
   line-height: 1.4;
 }
 
-.sidebar-settings-section {
-  padding: 16px 20px;
-  border-top: 1px solid var(--border-color);
-  background: var(--bg-secondary);
-  flex-shrink: 0;
-}
-
 .sidebar-skills-section {
   padding: 16px 20px;
   flex: 1;
@@ -874,26 +867,6 @@ body {
   width: 440px;
 }
 
-/* ---- Settings Modal ---- */
-.settings-trigger-btn {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 8px;
-  width: 100%;
-  padding: 12px;
-  background: var(--bg-tertiary);
-  border: 1px solid var(--border-color);
-  border-radius: var(--radius-sm);
-  color: var(--text-primary);
-  font-weight: 500;
-  cursor: pointer;
-  transition: all 0.2s ease;
-}
-.settings-trigger-btn:hover {
-  background: #ebebeb;
-}
-
 .settings-modal {
   margin: auto;
   padding: 0;
@@ -1073,3 +1046,68 @@ body {
   transform: none;
   box-shadow: none;
 }
+.label-hint {
+  color: var(--text-secondary);
+  font-size: 11px;
+  font-weight: 400;
+  margin-left: 4px;
+}
+
+/* OAuth UI */
+#apikey-oauth-section {
+  padding: 8px 0;
+}
+
+.oauth-status-card {
+  background: var(--bg-tertiary);
+  border: 1px solid var(--border-color);
+  border-radius: var(--radius-sm);
+  padding: 16px;
+  margin-bottom: 16px;
+}
+
+#oauth-status-indicator {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  font-size: 13px;
+  font-weight: 600;
+  margin-bottom: 8px;
+}
+
+.oauth-status-dot {
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+}
+
+.oauth-disconnected .oauth-status-dot {
+  background-color: #94a3b8;
+}
+
+.oauth-connected .oauth-status-dot {
+  background-color: #22c55e;
+}
+
+.oauth-disconnected #oauth-status-text {
+  color: var(--text-secondary);
+}
+
+.oauth-connected #oauth-status-text {
+  color: #16a34a;
+}
+
+.oauth-hint {
+  font-size: 12px;
+  color: var(--text-muted);
+  line-height: 1.5;
+}
+
+.oauth-btn {
+  width: 100%;
+  margin-top: 8px;
+}
+
+.oauth-btn svg {
+  margin-right: 8px;
+}

package/web/js/settings.js

@@ -1,200 +0,0 @@
-import { state } from "./config.js";
-import { restartRuntime, saveConfigData } from "./api.js";
-
-// DOM Elements
-let dialog;
-let settingsBtn;
-let closeBtn;
-let saveBtn;
-let providerSelect;
-let apiKeyInput;
-let telegramTokenInput;
-let slackBotTokenInput;
-let slackAppTokenInput;
-let keyStatus;
-let restartBtn;
-
-export function initSettings() {
-  dialog = document.getElementById("settings-dialog");
-  settingsBtn = document.getElementById("open-settings-btn");
-  closeBtn = document.getElementById("close-settings-btn");
-  saveBtn = document.getElementById("save-settings-btn");
-  
-  providerSelect = document.getElementById("provider-select");
-  apiKeyInput = document.getElementById("api-key-input");
-  telegramTokenInput = document.getElementById("telegram-token-input");
-  slackBotTokenInput = document.getElementById("slack-bot-token-input");
-  slackAppTokenInput = document.getElementById("slack-app-token-input");
-  keyStatus = document.getElementById("key-status");
-  restartBtn = document.getElementById("restart-service-btn");
-
-  if (!dialog) return;
-
-  // Open/Close dialog
-  if (settingsBtn) {
-    settingsBtn.addEventListener("click", () => {
-      populateForm();
-      dialog.showModal();
-    });
-  }
-  
-  if (closeBtn) {
-    closeBtn.addEventListener("click", () => {
-      dialog.close();
-      keyStatus.textContent = ""; // clear status on close
-    });
-  }
-
-  // Save Settings
-  if (saveBtn) {
-    saveBtn.addEventListener("click", handleSave);
-  }
-  if (restartBtn) {
-    restartBtn.addEventListener("click", handleRestart);
-  }
-
-  // Placeholder logic
-  if (providerSelect) {
-    providerSelect.addEventListener("change", updatePlaceholder);
-  }
-}
-
-function updatePlaceholder() {
-  const p = providerSelect.value;
-  if (p === "openai") apiKeyInput.placeholder = "sk-proj-...";
-  else if (p === "anthropic") apiKeyInput.placeholder = "sk-ant-api03-...";
-  else apiKeyInput.placeholder = "sk-...";
-}
-
-function populateForm() {
-  const config = state.config;
-  if (!config) return;
-
-  if (state.restartRequired) {
-    setStatus(
-      "Settings saved. Restart service to apply changes.",
-      "warning",
-    );
-    updateRestartButton(true);
-  } else {
-    setStatus("", "");
-    updateRestartButton(false);
-  }
-
-  if (config.hasApiKey && config.apiKey) {
-    apiKeyInput.value = config.apiKey;
-  } else if (config.hasApiKey) {
-    apiKeyInput.value = "***************************************************";
-  } else {
-    apiKeyInput.value = "";
-  }
-
-  if (config.provider) {
-    providerSelect.value = config.provider;
-  }
-  updatePlaceholder();
-
-  const adapters = config.adapters || {};
-  if (adapters.telegram && adapters.telegram.token) {
-    telegramTokenInput.value = adapters.telegram.token;
-  } else {
-    telegramTokenInput.value = "";
-  }
-
-  if (adapters.slack) {
-    slackBotTokenInput.value = adapters.slack.botToken || "";
-    slackAppTokenInput.value = adapters.slack.appToken || "";
-  } else {
-    slackBotTokenInput.value = "";
-    slackAppTokenInput.value = "";
-  }
-}
-
-async function handleSave() {
-  const key = apiKeyInput.value.trim();
-  const provider = providerSelect.value;
-  const telegramToken = telegramTokenInput.value.trim();
-  const slackBotToken = slackBotTokenInput.value.trim();
-  const slackAppToken = slackAppTokenInput.value.trim();
-
-  const adapters = {};
-  if (telegramToken) adapters.telegram = { token: telegramToken };
-  if (slackBotToken || slackAppToken) {
-    adapters.slack = { 
-       botToken: slackBotToken || undefined, 
-       appToken: slackAppToken || undefined 
-    };
-  }
-
-  const updates = { provider, adapters };
-  if (key && key !== "***************************************************" && key !== state.config.apiKey) {
-    updates.key = key;
-  }
-
-  try {
-    const res = await saveConfigData(updates);
-    
-    // Update local config
-    state.config.provider = res.provider;
-    state.config.adapters = res.adapters;
-    if (updates.key) {
-      state.config.hasApiKey = true;
-      state.config.apiKey = updates.key;
-    }
-    
-    if (state.config.hasApiKey && state.config.apiKey) {
-      apiKeyInput.value = state.config.apiKey;
-    } else if (state.config.hasApiKey) {
-      apiKeyInput.value = "***************************************************";
-    } else {
-      apiKeyInput.value = "";
-    }
-    state.restartRequired = !!res.requiresRestart;
-
-    if (res.requiresRestart) {
-      setStatus(
-        "Settings saved. Restart service to apply changes.",
-        "warning",
-      );
-      updateRestartButton(true);
-      return;
-    }
-
-    setStatus("Settings saved", "success");
-    updateRestartButton(false);
-
-  } catch (err) {
-    setStatus("Save failed: " + err.message, "error");
-  }
-}
-
-async function handleRestart() {
-  if (!restartBtn) return;
-
-  restartBtn.disabled = true;
-  if (saveBtn) saveBtn.disabled = true;
-  setStatus("Restarting service...", "warning");
-
-  try {
-    await restartRuntime();
-    setTimeout(() => {
-      window.location.reload();
-    }, 6000);
-  } catch (err) {
-    if (saveBtn) saveBtn.disabled = false;
-    restartBtn.disabled = false;
-    setStatus("Restart failed: " + err.message, "error");
-  }
-}
-
-function updateRestartButton(show) {
-  if (!restartBtn) return;
-  restartBtn.hidden = !show;
-  restartBtn.disabled = false;
-}
-
-function setStatus(message, status) {
-  if (!keyStatus) return;
-  keyStatus.textContent = message;
-  keyStatus.className = status ? `status-text ${status}` : "status-text";
-}