@corbat-tech/coco 2.25.8 → 2.25.10

package/dist/cli/index.js

@@ -121,6 +121,7 @@ function createDefaultConfigObject(projectName, language = "typescript") {
       temperature: 0,
       timeout: 12e4
     },
+    providerModels: {},
     quality: {
       minScore: 85,
       minCoverage: 80,
@@ -300,6 +301,7 @@ var init_schema = __esm({
         temperature: 0,
         timeout: 12e4
       }),
+      providerModels: z.record(z.string(), z.string()).optional(),
       quality: QualityConfigSchema.default({
         minScore: 85,
         minCoverage: 80,
@@ -597,6 +599,7 @@ function deepMergeConfig(base, override) {
     ...override,
     project: { ...base.project, ...override.project },
     provider: { ...base.provider, ...override.provider },
+    providerModels: { ...base.providerModels, ...override.providerModels },
     quality: { ...base.quality, ...override.quality },
     persistence: { ...base.persistence, ...override.persistence },
     // Merge optional sections only if present in either base or override
@@ -2543,7 +2546,7 @@ function getDefaultModel(provider) {
     case "codex":
       return process.env["CODEX_MODEL"] ?? "codex-mini-latest";
     case "copilot":
-      return process.env["COPILOT_MODEL"] ?? "gpt-4o-copilot";
+      return process.env["COPILOT_MODEL"] ?? "claude-sonnet-4.6";
     case "groq":
       return process.env["GROQ_MODEL"] ?? "llama-3.3-70b-versatile";
     case "openrouter":
@@ -2562,6 +2565,11 @@ function getDefaultModel(provider) {
       return "claude-sonnet-4-6";
   }
 }
+function normalizeConfiguredModel(model) {
+  if (typeof model !== "string") return void 0;
+  const trimmed = model.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
+}
 function getDefaultProvider() {
   const envProvider = process.env["COCO_PROVIDER"]?.toLowerCase();
   if (envProvider && VALID_PROVIDERS.includes(envProvider)) {
@@ -2583,8 +2591,12 @@ async function getLastUsedProvider() {
 async function getLastUsedModel(provider) {
   try {
     const config = await loadConfig(CONFIG_PATHS.config);
+    const perProviderModel = normalizeConfiguredModel(config.providerModels?.[provider]);
+    if (perProviderModel) {
+      return perProviderModel;
+    }
     if (config.provider.type === provider) {
-      return config.provider.model;
+      return normalizeConfiguredModel(config.provider.model);
     }
   } catch {
   }
@@ -2621,8 +2633,14 @@ async function saveProviderPreference(provider, model) {
     };
   }
   config.provider.type = provider;
-  if (model) {
-    config.provider.model = model;
+  const normalizedModel = normalizeConfiguredModel(model);
+  const persistedModel = normalizedModel ?? getDefaultModel(provider);
+  config.providerModels = {
+    ...config.providerModels,
+    [provider]: persistedModel
+  };
+  if (normalizedModel) {
+    config.provider.model = normalizedModel;
   } else {
     config.provider.model = getDefaultModel(provider);
   }
@@ -2719,11 +2737,25 @@ async function migrateOldPreferences() {
     }
     if (oldPrefs.provider && VALID_PROVIDERS.includes(oldPrefs.provider)) {
       config.provider.type = oldPrefs.provider;
+      config.providerModels = {
+        ...config.providerModels
+      };
+      for (const [providerName, modelName] of Object.entries(oldPrefs.models ?? {})) {
+        if (VALID_PROVIDERS.includes(providerName)) {
+          const normalized = normalizeConfiguredModel(modelName);
+          if (normalized) {
+            config.providerModels[providerName] = normalized;
+          }
+        }
+      }
       const modelForProvider = oldPrefs.provider ? oldPrefs.models?.[oldPrefs.provider] : void 0;
-      if (modelForProvider) {
-        config.provider.model = modelForProvider;
+      const normalizedMigratedModel = normalizeConfiguredModel(modelForProvider);
+      if (normalizedMigratedModel) {
+        config.provider.model = normalizedMigratedModel;
+        config.providerModels[oldPrefs.provider] = normalizedMigratedModel;
       } else {
         config.provider.model = getDefaultModel(oldPrefs.provider);
+        config.providerModels[oldPrefs.provider] = config.provider.model;
       }
       await saveConfig(config, void 0, true);
     }
@@ -5474,6 +5506,11 @@ var init_codex = __esm({
     };
   }
 });
+function normalizeModel(model) {
+  if (typeof model !== "string") return void 0;
+  const trimmed = model.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
+}
 function createCopilotProvider() {
   return new CopilotProvider();
 }
@@ -5528,7 +5565,7 @@ var init_copilot2 = __esm({
       async initialize(config) {
         this.config = {
           ...config,
-          model: config.model ?? DEFAULT_MODEL4
+          model: normalizeModel(config.model) ?? DEFAULT_MODEL4
         };
         const tokenResult = await getValidCopilotToken();
         if (tokenResult) {
@@ -6855,12 +6892,17 @@ __export(providers_exports, {
   listProviders: () => listProviders,
   withRetry: () => withRetry
 });
+function normalizeProviderModel(model) {
+  if (typeof model !== "string") return void 0;
+  const trimmed = model.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
+}
 async function createProvider(type, config = {}) {
   let provider;
   const mergedConfig = {
     apiKey: config.apiKey ?? getApiKey(type),
     baseUrl: config.baseUrl ?? getBaseUrl(type),
-    model: config.model ?? getDefaultModel(type),
+    model: normalizeProviderModel(config.model) ?? getDefaultModel(type),
     maxTokens: config.maxTokens,
     temperature: config.temperature,
     timeout: config.timeout
@@ -9783,7 +9825,7 @@ function generateToolCatalog(registry) {
 }
 async function createDefaultReplConfig() {
   const providerType = await getLastUsedProvider();
-  const model = await getLastUsedModel(providerType) ?? getDefaultModel(providerType);
+  const model = await getLastUsedModel(providerType) || getDefaultModel(providerType);
   return {
     provider: {
       type: providerType,
@@ -34598,8 +34640,9 @@ ${newProvider.emoji} ${newProvider.name} is not configured.`));
       newApiKeyForSaving = key;
     }
   }
+  const rememberedModel = await getLastUsedModel(newProvider.id);
   const recommendedModel = getRecommendedModel(newProvider.id);
-  const newModel = recommendedModel?.id || newProvider.models[0]?.id || "";
+  const newModel = rememberedModel || recommendedModel?.id || newProvider.models[0]?.id || "";
   const spinner18 = p26.spinner();
   spinner18.start(`Connecting to ${newProvider.name}...`);
   try {
@@ -40566,9 +40609,20 @@ function hasNullByte2(str) {
 }
 function normalizePath2(filePath) {
   let normalized = filePath.replace(/\0/g, "");
+  const home = process.env.HOME || process.env.USERPROFILE;
+  if (home && normalized.startsWith("~")) {
+    if (normalized === "~") {
+      normalized = home;
+    } else if (normalized.startsWith("~/") || normalized.startsWith(`~${path39__default.sep}`)) {
+      normalized = path39__default.join(home, normalized.slice(2));
+    }
+  }
   normalized = path39__default.normalize(normalized);
   return normalized;
 }
+function resolveUserPath(filePath) {
+  return path39__default.resolve(normalizePath2(filePath));
+}
 function isWithinDirectory(targetPath, baseDir) {
   const normalizedTarget = path39__default.normalize(targetPath);
   const normalizedBase = path39__default.normalize(baseDir);
@@ -40601,7 +40655,7 @@ function isPathAllowed(filePath, operation) {
     return { allowed: false, reason: "Path contains invalid characters" };
   }
   const normalized = normalizePath2(filePath);
-  const absolute = path39__default.resolve(normalized);
+  const absolute = resolveUserPath(normalized);
   const cwd = process.cwd();
   for (const blocked of BLOCKED_PATHS2) {
     const normalizedBlocked = path39__default.normalize(blocked);
@@ -40660,7 +40714,7 @@ function isENOENT(error) {
   return error.code === "ENOENT";
 }
 async function enrichENOENT(filePath, operation) {
-  const absPath = path39__default.resolve(filePath);
+  const absPath = resolveUserPath(filePath);
   const suggestions = await suggestSimilarFilesDeep(absPath, process.cwd());
   const hint = formatSuggestions(suggestions, path39__default.dirname(absPath));
   const action = operation === "read" ? "Use glob or list_dir to find the correct path." : "Check that the parent directory exists.";
@@ -40668,7 +40722,7 @@ async function enrichENOENT(filePath, operation) {
 ${action}`;
 }
 async function enrichDirENOENT(dirPath) {
-  const absPath = path39__default.resolve(dirPath);
+  const absPath = resolveUserPath(dirPath);
   const suggestions = await suggestSimilarDirsDeep(absPath, process.cwd());
   const hint = formatSuggestions(suggestions, path39__default.dirname(absPath));
   return `Directory not found: ${dirPath}${hint}
@@ -40691,7 +40745,7 @@ Examples:
   async execute({ path: filePath, encoding, maxSize }) {
     validatePath(filePath, "read");
     try {
-      const absolutePath = path39__default.resolve(filePath);
+      const absolutePath = resolveUserPath(filePath);
       const stats = await fs35__default.stat(absolutePath);
       const maxBytes = maxSize ?? DEFAULT_MAX_FILE_SIZE;
       let truncated = false;
@@ -40750,7 +40804,7 @@ Examples:
   async execute({ path: filePath, content, createDirs, dryRun }) {
     validatePath(filePath, "write");
     try {
-      const absolutePath = path39__default.resolve(filePath);
+      const absolutePath = resolveUserPath(filePath);
       let wouldCreate = false;
       try {
         await fs35__default.access(absolutePath);
@@ -40812,7 +40866,7 @@ Examples:
   async execute({ path: filePath, oldText, newText, all, dryRun }) {
     validatePath(filePath, "write");
     try {
-      const absolutePath = path39__default.resolve(filePath);
+      const absolutePath = resolveUserPath(filePath);
       let content = await fs35__default.readFile(absolutePath, "utf-8");
       let replacements = 0;
       if (all) {
@@ -40933,7 +40987,7 @@ Examples:
   }),
   async execute({ path: filePath }) {
     try {
-      const absolutePath = path39__default.resolve(filePath);
+      const absolutePath = resolveUserPath(filePath);
       const stats = await fs35__default.stat(absolutePath);
       return {
         exists: true,
@@ -40964,7 +41018,7 @@ Examples:
   }),
   async execute({ path: dirPath, recursive }) {
     try {
-      const absolutePath = path39__default.resolve(dirPath);
+      const absolutePath = resolveUserPath(dirPath);
       const entries = [];
       async function listDir(dir, prefix = "") {
         const items = await fs35__default.readdir(dir, { withFileTypes: true });
@@ -41024,7 +41078,7 @@ Examples:
     }
     validatePath(filePath, "delete");
     try {
-      const absolutePath = path39__default.resolve(filePath);
+      const absolutePath = resolveUserPath(filePath);
       const stats = await fs35__default.stat(absolutePath);
       if (stats.isDirectory()) {
         if (!recursive) {
@@ -41040,7 +41094,7 @@ Examples:
     } catch (error) {
       if (error instanceof ToolError) throw error;
       if (error.code === "ENOENT") {
-        return { deleted: false, path: path39__default.resolve(filePath) };
+        return { deleted: false, path: resolveUserPath(filePath) };
       }
       throw new FileSystemError(`Failed to delete: ${filePath}`, {
         path: filePath,
@@ -41068,8 +41122,8 @@ Examples:
     validatePath(source, "read");
     validatePath(destination, "write");
     try {
-      const srcPath = path39__default.resolve(source);
-      const destPath = path39__default.resolve(destination);
+      const srcPath = resolveUserPath(source);
+      const destPath = resolveUserPath(destination);
       if (!overwrite) {
         try {
           await fs35__default.access(destPath);
@@ -41129,8 +41183,8 @@ Examples:
     validatePath(source, "delete");
     validatePath(destination, "write");
     try {
-      const srcPath = path39__default.resolve(source);
-      const destPath = path39__default.resolve(destination);
+      const srcPath = resolveUserPath(source);
+      const destPath = resolveUserPath(destination);
       if (!overwrite) {
         try {
           await fs35__default.access(destPath);
@@ -41216,7 +41270,7 @@ Examples:
   }),
   async execute({ path: dirPath, depth, showHidden, dirsOnly }) {
     try {
-      const absolutePath = path39__default.resolve(dirPath ?? ".");
+      const absolutePath = resolveUserPath(dirPath ?? ".");
       let totalFiles = 0;
       let totalDirs = 0;
       const lines = [path39__default.basename(absolutePath) + "/"];
@@ -49682,6 +49736,43 @@ function getAllCommands() {
 
 // src/cli/repl/input/handler.ts
 var HISTORY_FILE = path39.join(os4.homedir(), ".coco", "history");
+function navigateHistory(direction, state) {
+  const { currentLine, historyIndex, sessionHistory, tempLine } = state;
+  if (direction === "up") {
+    if (sessionHistory.length === 0) return null;
+    let nextIndex = historyIndex;
+    let nextTempLine = tempLine;
+    if (nextIndex === -1) {
+      nextTempLine = currentLine;
+      nextIndex = sessionHistory.length - 1;
+    } else if (nextIndex > 0) {
+      nextIndex--;
+    }
+    return {
+      currentLine: sessionHistory[nextIndex] ?? "",
+      cursorPos: 0,
+      historyIndex: nextIndex,
+      tempLine: nextTempLine
+    };
+  }
+  if (historyIndex === -1) return null;
+  if (historyIndex < sessionHistory.length - 1) {
+    const nextIndex = historyIndex + 1;
+    const nextLine = sessionHistory[nextIndex] ?? "";
+    return {
+      currentLine: nextLine,
+      cursorPos: nextLine.length,
+      historyIndex: nextIndex,
+      tempLine
+    };
+  }
+  return {
+    currentLine: tempLine,
+    cursorPos: tempLine.length,
+    historyIndex: -1,
+    tempLine
+  };
+}
 async function handleOptionC(copyFn = copyToClipboard, getLastBlockFn = getLastBlock) {
   const block = getLastBlockFn();
   if (!block) return null;
@@ -50255,14 +50346,18 @@ function createInputHandler(_session) {
               cursorPos = 0;
               render();
             } else if (sessionHistory.length > 0) {
-              if (historyIndex === -1) {
-                tempLine = currentLine;
-                historyIndex = sessionHistory.length - 1;
-              } else if (historyIndex > 0) {
-                historyIndex--;
+              const nextState = navigateHistory("up", {
+                currentLine,
+                historyIndex,
+                sessionHistory,
+                tempLine
+              });
+              if (nextState) {
+                currentLine = nextState.currentLine;
+                cursorPos = nextState.cursorPos;
+                historyIndex = nextState.historyIndex;
+                tempLine = nextState.tempLine;
               }
-              currentLine = sessionHistory[historyIndex] ?? "";
-              cursorPos = currentLine.length;
               render();
             }
             return;
@@ -50284,14 +50379,18 @@ function createInputHandler(_session) {
               cursorPos = currentLine.length;
               render();
             } else if (historyIndex !== -1) {
-              if (historyIndex < sessionHistory.length - 1) {
-                historyIndex++;
-                currentLine = sessionHistory[historyIndex] ?? "";
-              } else {
-                historyIndex = -1;
-                currentLine = tempLine;
+              const nextState = navigateHistory("down", {
+                currentLine,
+                historyIndex,
+                sessionHistory,
+                tempLine
+              });
+              if (nextState) {
+                currentLine = nextState.currentLine;
+                cursorPos = nextState.cursorPos;
+                historyIndex = nextState.historyIndex;
+                tempLine = nextState.tempLine;
               }
-              cursorPos = currentLine.length;
               render();
             }
             return;
@@ -53002,6 +53101,8 @@ async function startRepl(options = {}) {
     );
   }
   let mcpManager = null;
+  let configuredMcpServers = [];
+  const registeredMcpServers = /* @__PURE__ */ new Set();
   const logger2 = (await Promise.resolve().then(() => (init_logger(), logger_exports))).getLogger();
   try {
     const { getMCPServerManager: getMCPServerManager2 } = await Promise.resolve().then(() => (init_lifecycle(), lifecycle_exports));
@@ -53018,6 +53119,7 @@ async function startRepl(options = {}) {
       cocoConfigServers.filter((s) => s.enabled !== false),
       projectServers.filter((s) => s.enabled !== false)
     );
+    configuredMcpServers = enabledServers;
     if (enabledServers.length > 0) {
       mcpManager = getMCPServerManager2();
       let connections;
@@ -53037,6 +53139,7 @@ async function startRepl(options = {}) {
       for (const connection of connections.values()) {
         try {
           const wrapped = await registerMCPTools2(toolRegistry, connection.name, connection.client);
+          registeredMcpServers.add(connection.name);
           if (wrapped.length === 0) {
             logger2.warn(
               `[MCP] Server '${connection.name}' connected but exposed 0 tools (check server auth/scopes).`
@@ -53065,6 +53168,42 @@ async function startRepl(options = {}) {
       `[MCP] Initialization failed: ${mcpError instanceof Error ? mcpError.message : String(mcpError)}`
     );
   }
+  async function ensureRequestedMcpConnections(message) {
+    if (!mcpManager || configuredMcpServers.length === 0) return;
+    const normalizedMessage = message.toLowerCase();
+    const explicitlyRequestsMcp = /\bmcp\b/.test(normalizedMessage) || /\b(use|using|usa|usar|utiliza|utilizar)\b.{0,24}\bmcp\b/.test(normalizedMessage);
+    const matchingServers = configuredMcpServers.filter((server) => {
+      if (mcpManager?.getConnection(server.name)) return false;
+      if (explicitlyRequestsMcp) return true;
+      const loweredName = server.name.toLowerCase();
+      if (normalizedMessage.includes(loweredName)) return true;
+      if (loweredName.includes("atlassian")) {
+        return /\b(atlassian|jira|confluence)\b/.test(normalizedMessage);
+      }
+      return false;
+    });
+    for (const server of matchingServers) {
+      try {
+        const connection = await mcpManager.startServer(server);
+        if (!registeredMcpServers.has(connection.name)) {
+          await (await Promise.resolve().then(() => (init_tools(), tools_exports))).registerMCPTools(
+            toolRegistry,
+            connection.name,
+            connection.client
+          );
+          registeredMcpServers.add(connection.name);
+        }
+      } catch (error) {
+        logger2.warn(
+          `[MCP] On-demand connect failed for '${server.name}': ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+    }
+  }
+  function extractMessageText(content) {
+    if (typeof content === "string") return content;
+    return content.filter((block) => block.type === "text").map((block) => block.text).join(" ");
+  }
   let hookRegistry;
   let hookExecutor;
   try {
@@ -53512,6 +53651,7 @@ ${imagePrompts}`.trim() : imagePrompts;
       let streamStarted = false;
       let llmCallCount = 0;
       let lastToolGroup = null;
+      await ensureRequestedMcpConnections(extractMessageText(effectiveMessage));
       const result = await executeAgentTurn(session, effectiveMessage, provider, toolRegistry, {
         onStream: (chunk) => {
           if (!streamStarted) {