counselors 0.4.9 → 0.4.11

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.9" : "0.0.0-dev";
+var VERSION = true ? "0.4.11" : "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",
@@ -2155,7 +2163,7 @@ function normalizeWindowsPathForComparison(path) {
   const withoutTrailing = normalized === root ? normalized : normalized.replace(/[\\/]+$/, "");
   return withoutTrailing.toLowerCase();
 }
-function execute(invocation, timeoutMs) {
+function execute(invocation, timeoutMs, onSpawn) {
   return new Promise((resolve7) => {
     const start = Date.now();
     let stdout = "";
@@ -2193,6 +2201,7 @@ function execute(invocation, timeoutMs) {
       shell: false,
       windowsHide: true
     });
+    onSpawn?.(child.pid);
     const stdoutStream = child.stdout;
     const stderrStream = child.stderr;
     const stdinStream = child.stdin;
@@ -2314,13 +2323,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.exitCode === 0 && 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 {
@@ -2640,8 +2652,9 @@ async function dispatch(options) {
       const isAmp = (toolConfig.adapter ?? id) === "amp";
       const usageBefore = isAmp ? await captureAmpUsage() : null;
       debug(`Dispatching ${id}`);
-      onProgress?.({ toolId: id, event: "started" });
-      const result = await execute(invocation, toolTimeoutMs);
+      const result = await execute(invocation, toolTimeoutMs, (pid) => {
+        onProgress?.({ toolId: id, event: "started", pid });
+      });
       const usageAfter = isAmp ? await captureAmpUsage() : null;
       const cost = isAmp && usageBefore && usageAfter ? computeAmpCostFromSnapshots(usageBefore, usageAfter) : void 0;
       const safeId = sanitizeId(id);
@@ -2827,6 +2840,7 @@ var ProgressDisplay = class {
   frame = 0;
   lineCount = 0;
   isTTY;
+  infoNotePrinted = false;
   constructor(toolIds, outputDir) {
     this.isTTY = Boolean(process.stderr.isTTY);
     this.outputDir = outputDir;
@@ -2848,15 +2862,22 @@ var ProgressDisplay = class {
     } else {
       process.stderr.write(`  Output: ${this.outputDir}
 `);
+      process.stderr.write(`  \u2139 This may take more than 10 minutes
+`);
+      process.stderr.write(`  PID: ${process.pid}
+`);
+      this.infoNotePrinted = true;
     }
   }
-  start(toolId) {
+  start(toolId, pid) {
     const tool = this.tools.get(toolId);
     if (!tool) return;
     tool.status = "running";
     tool.startedAt = Date.now();
+    tool.pid = pid;
     if (!this.isTTY) {
-      process.stderr.write(`  \u25B8 ${toolId} started
+      const pidStr = pid ? `PID ${pid}  ` : "";
+      process.stderr.write(`  \u25B8 ${pidStr}${toolId} started
 `);
     }
   }
@@ -2892,6 +2913,18 @@ var ProgressDisplay = class {
   render() {
     const lines = [];
     lines.push(`  ${DIM}Output: ${this.outputDir}${RESET}`);
+    if (!this.infoNotePrinted) {
+      const anyStarted = this.order.some(
+        (id) => this.tools.get(id).status !== "pending"
+      );
+      if (anyStarted) {
+        this.infoNotePrinted = true;
+      }
+    }
+    if (this.infoNotePrinted) {
+      lines.push(`  \u2139 This may take more than 10 minutes`);
+      lines.push(`  PID: ${process.pid}`);
+    }
     for (const id of this.order) {
       const tool = this.tools.get(id);
       lines.push(this.formatLine(tool));
@@ -2919,8 +2952,10 @@ var ProgressDisplay = class {
       case "running": {
         const spinner = SPINNER_FRAMES[this.frame % SPINNER_FRAMES.length];
         const elapsed = tool.startedAt ? ((Date.now() - tool.startedAt) / 1e3).toFixed(1) : "0.0";
-        const pad = " ".repeat(Math.max(0, 40 - label.length));
-        return `  ${spinner} ${label}${pad}running  ${elapsed.padStart(6)}s`;
+        const pidPrefix = tool.pid ? `PID ${tool.pid}  ` : "";
+        const fullLabel = `${pidPrefix}${label}`;
+        const pad = " ".repeat(Math.max(0, 40 - fullLabel.length));
+        return `  ${spinner} ${fullLabel}${pad}running  ${elapsed.padStart(6)}s`;
       }
       case "done": {
         const r = tool.report;
@@ -3155,7 +3190,8 @@ function registerRunCommand(program2) {
           readOnlyPolicy,
           cwd,
           onProgress: (event) => {
-            if (event.event === "started") display.start(event.toolId);
+            if (event.event === "started")
+              display.start(event.toolId, event.pid);
             if (event.event === "completed")
               display.complete(event.toolId, event.report);
           }
@@ -3321,6 +3357,8 @@ Use \`timeout: 600000\` (10 minutes). Counselors dispatches to the selected agen
 
 **Important**: Use \`-f\` (file mode) so the prompt is sent as-is without wrapping. Use \`--json\` to get structured output for parsing.
 
+**Timing**: Sessions commonly take more than 10 minutes. Counselors prints each child process PID alongside the agent name in its progress output (e.g. \`PID 12345  claude\`). If a run seems stuck, you can verify processes are still alive with \`ps -p <PID>\` (macOS/Linux) or \`tasklist /FI "PID eq <PID>"\` (Windows).
+
 ---
 
 ## Phase 5: Read Results
@@ -3435,8 +3473,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(
@@ -3467,7 +3523,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);
@@ -3475,6 +3531,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;