counselors 0.4.8 → 0.4.10

package/dist/cli.js

@@ -218,7 +218,7 @@ var SAFE_ID_RE = /^[a-zA-Z0-9._-]+$/;
 function sanitizePath(p) {
   return p.replace(/[\x00-\x08\x0A-\x1F]/g, "");
 }
-var VERSION = true ? "0.4.8" : "0.0.0-dev";
+var VERSION = true ? "0.4.10" : "0.0.0-dev";
 
 // src/types.ts
 import { z } from "zod";
@@ -397,10 +397,14 @@ async function selectModelDetails(toolId, models) {
     name: m.recommended ? `${m.name} (Recommended)` : m.name,
     value: String(i)
   }));
+  choices.push({ name: "Custom model...", value: "__custom__" });
   const idx = await select({
     message: `Select model for ${toolId}:`,
     choices
   });
+  if (idx === "__custom__") {
+    return { id: "__custom__" };
+  }
   const model = models[Number(idx)];
   return {
     id: model.id,
@@ -615,6 +619,7 @@ import { existsSync as existsSync3 } from "fs";
 
 // src/adapters/base.ts
 var BaseAdapter = class {
+  modelFlag = "-m";
   getEffectiveReadOnlyLevel(_toolConfig) {
     return this.readOnly.level;
   }
@@ -713,6 +718,7 @@ var ClaudeAdapter = class extends BaseAdapter {
   commands = ["claude"];
   installUrl = "https://docs.anthropic.com/en/docs/claude-code";
   readOnly = { level: "enforced" };
+  modelFlag = "--model";
   models = [
     {
       id: "opus",
@@ -2127,6 +2133,8 @@ var ENV_ALLOWLIST = [
   "GEMINI_API_KEY",
   "GOOGLE_API_KEY",
   "GOOGLE_APPLICATION_CREDENTIALS",
+  "GOOGLE_CLOUD_PROJECT",
+  "GOOGLE_CLOUD_LOCATION",
   "AMP_API_KEY",
   // Proxy
   "HTTP_PROXY",
@@ -2314,11 +2322,16 @@ async function executeTest(adapter, toolConfig, toolName) {
   const cmdStr = [invocation.cmd, ...invocation.args].map(quote).join(" ");
   const command = invocation.stdin != null ? `echo ${quote(invocation.stdin)} | ${cmdStr}` : cmdStr;
   const result = await execute(invocation, TEST_TIMEOUT);
-  const passed = result.stdout.includes("OK");
+  const echoedPrompt = result.stdout.includes("User instructions");
+  const passed = result.exitCode === 0 && result.stdout.includes("OK") && !echoedPrompt;
   let error2;
   if (!passed) {
     if (result.timedOut) {
       error2 = `Timed out after ${TEST_TIMEOUT / 1e3}s`;
+    } else if (result.exitCode !== 0) {
+      error2 = result.stderr.trim() || `Process exited with code ${result.exitCode}`;
+    } else if (echoedPrompt) {
+      error2 = "Tool echoed the prompt instead of a model response (check model access)";
     } else if (result.stderr.trim()) {
       error2 = result.stderr.slice(0, 500);
     } else {
@@ -3433,8 +3446,26 @@ async function addBuiltInTool(toolId, config, nameOverride) {
     return;
   }
   const selectedModel = await selectModelDetails(toolId, adapter.models);
-  const fallbackName = selectedModel.id.startsWith(`${toolId}-`) ? selectedModel.id : `${toolId}-${selectedModel.id}`;
-  const defaultName = nameOverride ?? selectedModel.compoundId ?? fallbackName;
+  let extraFlags;
+  let defaultName;
+  if (selectedModel.id === "__custom__") {
+    const modelId = await promptInput("Model identifier:");
+    if (!modelId.trim()) {
+      error("No model identifier provided.");
+      process.exitCode = 1;
+      return;
+    }
+    const extraInput = await promptInput(
+      "Extra flags (optional, space-separated):"
+    );
+    const parsedExtra = extraInput.trim() ? extraInput.trim().split(/\s+/) : [];
+    extraFlags = [adapter.modelFlag ?? "-m", modelId.trim(), ...parsedExtra];
+    defaultName = nameOverride ?? `${toolId}-${sanitizeId(modelId.trim())}`;
+  } else {
+    extraFlags = selectedModel.extraFlags;
+    const fallbackName = selectedModel.id.startsWith(`${toolId}-`) ? selectedModel.id : `${toolId}-${selectedModel.id}`;
+    defaultName = nameOverride ?? selectedModel.compoundId ?? fallbackName;
+  }
   let name = nameOverride ?? await promptInput("Tool name:", defaultName);
   if (!SAFE_ID_RE.test(name)) {
     error(
@@ -3465,7 +3496,7 @@ async function addBuiltInTool(toolId, config, nameOverride) {
     binary: discovery.path,
     readOnly: { level: adapter.readOnly.level },
     adapter: toolId,
-    ...selectedModel.extraFlags ? { extraFlags: selectedModel.extraFlags } : {}
+    ...extraFlags ? { extraFlags } : {}
   };
   const updated = addToolToConfig(config, name, toolConfig);
   saveConfig(updated);
@@ -3473,6 +3504,17 @@ async function addBuiltInTool(toolId, config, nameOverride) {
     copyAmpSettings();
   }
   success(`Added "${name}" to config.`);
+  if (selectedModel.id === "__custom__") {
+    info("Testing tool configuration...");
+    const testAdapter = resolveAdapter(name, toolConfig);
+    const result = await executeTest(testAdapter, toolConfig, name);
+    info(formatTestResults([result]));
+    if (!result.passed) {
+      warn(
+        "The tool was saved to your config but the test failed. You may need to check your API access or flags."
+      );
+    }
+  }
 }
 async function collectCustomConfig(config, presetId) {
   let binaryPath = null;