@dench.com/cli 2.7.4 → 2.7.5

package/dench.ts

@@ -677,7 +677,7 @@ Usage:
   dench integrations [--json]
   dench tool status [toolkit] [--json]
   dench tool connect <toolkit> [--callback-url <url>] [--json]
-  dench tool search "create github issue" [--toolkit github] [--limit 20] [--json]
+  dench tool search "create github issue" [--toolkit github] [--limit 20] [--compact] [--json]
   dench tool run <composio_tool_slug> --args '{"key":"value"}' [--account <connectedAccountId>] [--json]
   dench tool disconnect <connectionId> [--json]
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dench.com/cli",
-  "version": "2.7.4",
+  "version": "2.7.5",
   "description": "Dench agent workspace CLI.",
   "type": "module",
   "bin": {

package/tools.ts

@@ -11,7 +11,7 @@
  *
  *   dench apps [--json]                                            — list connected apps
  *   dench tool status [toolkit?] [--json]                          — list connections (optionally narrowed)
- *   dench tool search "<query>" [--toolkit <slug>] [--limit N] [--json]
+ *   dench tool search "<query>" [--toolkit <slug>] [--limit N] [--compact] [--json]
  *   dench tool run <slug> [--args <json>] [--account <id>] [--json]
  *   dench tool connect <toolkit> [--callback-url <url>] [--json]   — print OAuth redirect URL
  *   dench tool disconnect <connectionId> [--json]
@@ -187,12 +187,22 @@ async function runSearchSubcommand(ctx: ToolCliContext): Promise<void> {
   const toolkit = getFlag(ctx.args, "--toolkit");
   const limitRaw = getFlag(ctx.args, "--limit");
   const limit = limitRaw ? parsePositiveInt("--limit", limitRaw) : undefined;
+  const compact = hasFlag(ctx.args, "--compact");
   const queryParts = ctx.args.slice();
   ctx.args.length = 0;
+  // Everything left is the query, so an unconsumed flag would be searched for
+  // as a word and quietly match nothing. Refuse it instead: a typo that reads
+  // as "no results" is indistinguishable from an empty catalog.
+  const unknown = queryParts.find((part) => part.startsWith("--"));
+  if (unknown) {
+    throw new ToolCliError(
+      `Unknown flag for dench tool search: ${unknown}. Supported: --toolkit <slug>, --limit N, --compact, --json.`,
+    );
+  }
   const query = queryParts.join(" ").trim();
   if (!query) {
     throw new ToolCliError(
-      'Usage: dench tool search "<query>" [--toolkit <slug>] [--limit N] [--json]',
+      'Usage: dench tool search "<query>" [--toolkit <slug>] [--limit N] [--compact] [--json]',
     );
   }
 
@@ -210,7 +220,7 @@ async function runSearchSubcommand(ctx: ToolCliContext): Promise<void> {
     console.log(JSON.stringify(payload, null, 2));
     return;
   }
-  console.log(formatSearchResult(payload));
+  console.log(formatSearchResult(payload, compact));
 }
 
 async function runRunSubcommand(ctx: ToolCliContext): Promise<void> {
@@ -249,7 +259,22 @@ async function runRunSubcommand(ctx: ToolCliContext): Promise<void> {
       body,
     );
   } catch (error) {
-    if (error instanceof GatewayHttpError && isLikelyNoConnection(error)) {
+    if (!(error instanceof GatewayHttpError)) throw error;
+    // Ambiguity is the opposite of a missing connection, and it has to be
+    // checked first: the gateway reports it with a 400 whose body also trips
+    // the no-connection hints, which would send the caller off to add a third
+    // account when the fix is to name one of the two they have.
+    if (isAccountSelectionRequired(error)) {
+      const selection = accountSelectionPayload(toolSlug, error);
+      console.log(
+        ctx.jsonOutput
+          ? JSON.stringify(selection, null, 2)
+          : formatAccountSelection(selection),
+      );
+      process.exitCode = 1;
+      return;
+    }
+    if (isLikelyNoConnection(error)) {
       const noConnPayload = noConnectionPayload(toolSlug, error);
       if (ctx.jsonOutput) {
         console.log(JSON.stringify(noConnPayload, null, 2));
@@ -475,8 +500,9 @@ async function callGateway(
 // Result extraction & formatting
 // ---------------------------------------------------------------------------
 
+const ACCOUNT_SELECTION_CODE = "composio_account_selection_required";
+
 const NO_CONNECTION_HINTS = [
-  "composio_account_selection_required",
   "no active connection",
   "no connection found",
   "connected_account_id is required",
@@ -493,6 +519,78 @@ function isLikelyNoConnection(error: GatewayHttpError): boolean {
   return NO_CONNECTION_HINTS.some((hint) => lower.includes(hint));
 }
 
+function isAccountSelectionRequired(error: GatewayHttpError): boolean {
+  return error.body.toLowerCase().includes(ACCOUNT_SELECTION_CODE);
+}
+
+function accountSelectionPayload(toolSlug: string, error: GatewayHttpError) {
+  const accounts = accountChoices(error.body);
+  return {
+    ok: false,
+    account_selection_required: true,
+    tool_slug: toolSlug,
+    toolkit: toolkitFromSlug(toolSlug),
+    accounts,
+    error: error.message,
+    next_actions: accounts.length
+      ? accounts.map(
+          (account) =>
+            `Re-run with --account ${account.connected_account_id}${account.label ? ` (${account.label})` : ""}`,
+        )
+      : [
+          "Re-run with --account <connected_account_id>. Run `dench tool status <toolkit> --json` to list them.",
+        ],
+  };
+}
+
+/**
+ * The candidate accounts named in an account-selection error. The gateway
+ * already lists them, so parse them back out rather than spending a round trip
+ * re-listing connections the caller was just handed.
+ *
+ * They arrive as a JSON array inside the JSON-encoded error message, so decode
+ * the body first: that hands the array back unescaped instead of leaving us to
+ * undo the escaping by hand.
+ */
+function accountChoices(body: string) {
+  const error = asRecord(asRecord(parseJsonOrUndefined(body))?.error);
+  const message = stringField(error, "message") ?? "";
+  const start = message.indexOf("[");
+  const end = message.lastIndexOf("]");
+  if (start === -1 || end <= start) return [];
+  const parsed = parseJsonOrUndefined(message.slice(start, end + 1));
+  return asRecordArray(parsed).flatMap((entry) => {
+    const id = stringField(entry, "connected_account_id");
+    if (!id) return [];
+    return [
+      { connected_account_id: id, label: stringField(entry, "label", "email") },
+    ];
+  });
+}
+
+function parseJsonOrUndefined(value: string): unknown {
+  try {
+    return JSON.parse(value);
+  } catch {
+    return undefined;
+  }
+}
+
+function formatAccountSelection(
+  payload: ReturnType<typeof accountSelectionPayload>,
+) {
+  return [
+    "Multiple active accounts for this tool — name the one to use.",
+    `Tool: ${payload.tool_slug}`,
+    payload.toolkit ? `Toolkit: ${payload.toolkit}` : null,
+    "",
+    "Next actions:",
+    ...payload.next_actions.map((line) => `  - ${line}`),
+  ]
+    .filter((line) => line !== null)
+    .join("\n");
+}
+
 function noConnectionPayload(toolSlug: string, error: GatewayHttpError) {
   const toolkit = toolkitFromSlug(toolSlug);
   return {
@@ -623,7 +721,7 @@ function toolApprovalHint(toolSlug: string | undefined): string {
   return readOnly ? `read-only (${readOnly})` : "approval likely";
 }
 
-function formatSearchResult(searchResult: unknown): string {
+function formatSearchResult(searchResult: unknown, compact = false): string {
   const root = asRecord(searchResult);
   const data = asRecord(root?.data) ?? root;
   const items = extractSearchItems(data);
@@ -658,7 +756,9 @@ function formatSearchResult(searchResult: unknown): string {
     const isConnected =
       booleanField(asRecord(tool.connection_status), "is_connected") ??
       connectedSet.has(toolkit.toLowerCase());
-    const description = compactLine(tool.description) ?? null;
+    const description = compact
+      ? null
+      : (compactLine(tool.description) ?? null);
     lines.push(
       `${index + 1}. ${slug} - ${name}`,
       `   toolkit: ${toolkit} | ${toolApprovalHint(slug)} | ${
@@ -752,7 +852,7 @@ Usage:
   dench apps [--json]
   dench tool status [toolkit] [--json]
   dench tool connect <toolkit> [--callback-url <url>] [--json]
-  dench tool search "create github issue" [--toolkit github] [--limit 20] [--json]
+  dench tool search "create github issue" [--toolkit github] [--limit 20] [--compact] [--json]
   dench tool run <composio_tool_slug> --args '{"key":"value"}' [--account <connectedAccountId>] [--json]
   dench tool disconnect <connectionId> [--json]