@dench.com/cli 3.5.8-staging.350 → 3.6.0-staging.356

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dench.com/cli",
-  "version": "3.5.8-staging.350",
+  "version": "3.6.0-staging.356",
   "description": "Dench agent workspace CLI.",
   "type": "module",
   "bin": {

package/search.ts

@@ -108,8 +108,8 @@ function assertFlagsSupportedForCategory(
   );
   if (offenders.length === 0) return;
   throw new SearchCliError(
-    `${offenders.join(", ")} has no effect on ${category} search — Exa ` +
-      "either rejects it or silently ignores it, so the results would not " +
+    `${offenders.join(", ")} has no effect on ${category} search — the ` +
+      "search either rejects it or silently ignores it, so the results would not " +
       "match what you asked for. (Unsupported for " +
       `${category}: ${[...unsupported].join(", ")}.) ` +
       "Put those constraints in the query text instead, e.g. " +
@@ -194,12 +194,6 @@ function asString(value: unknown): string | undefined {
   return typeof value === "string" ? value : undefined;
 }
 
-function asNumber(value: unknown): number | undefined {
-  return typeof value === "number" && Number.isFinite(value)
-    ? value
-    : undefined;
-}
-
 function asObject(value: unknown): Record<string, unknown> | undefined {
   return value && typeof value === "object" && !Array.isArray(value)
     ? (value as Record<string, unknown>)
@@ -229,11 +223,6 @@ function formatSearchResults(payload: unknown, limit?: number): string {
   if (!root) return "(no results)";
   const results = asArray(root.results);
   const lines: string[] = [];
-  const auto = asString(root.autopromptString);
-  if (auto) {
-    lines.push(`Auto-prompt: ${auto}`);
-    lines.push("");
-  }
   if (results.length === 0) {
     lines.push("(no results)");
     return lines.join("\n");
@@ -263,10 +252,6 @@ function formatSearchResults(payload: unknown, limit?: number): string {
     if (snippet) lines.push(`   ${trimSnippet(snippet, 240)}`);
     lines.push("");
   }
-  const cost = asNumber(asObject(root.costDollars)?.total);
-  if (cost !== undefined) {
-    lines.push(`Cost (USD): $${cost.toFixed(4)}`);
-  }
   return lines.join("\n").trimEnd();
 }
 
@@ -278,11 +263,6 @@ function formatSearchResults(payload: unknown, limit?: number): string {
 function formatPeopleResults(payload: unknown, limit?: number): string {
   const hits = parseExaPeopleResults(payload);
   const lines: string[] = [];
-  const auto = asString(asObject(payload)?.autopromptString);
-  if (auto) {
-    lines.push(`Auto-prompt: ${auto}`);
-    lines.push("");
-  }
   if (hits.length === 0) {
     lines.push("(no people found)");
     return lines.join("\n");
@@ -301,8 +281,6 @@ function formatPeopleResults(payload: unknown, limit?: number): string {
     if (hit.url) lines.push(`   ${hit.url}`);
     lines.push("");
   }
-  const cost = asNumber(asObject(asObject(payload)?.costDollars)?.total);
-  if (cost !== undefined) lines.push(`Cost (USD): $${cost.toFixed(4)}`);
   return lines.join("\n").trimEnd();
 }
 
@@ -314,11 +292,6 @@ function formatPeopleResults(payload: unknown, limit?: number): string {
 function formatCompanyResults(payload: unknown, limit?: number): string {
   const hits = parseExaCompanyResults(payload);
   const lines: string[] = [];
-  const auto = asString(asObject(payload)?.autopromptString);
-  if (auto) {
-    lines.push(`Auto-prompt: ${auto}`);
-    lines.push("");
-  }
   if (hits.length === 0) {
     lines.push("(no companies found)");
     return lines.join("\n");
@@ -355,8 +328,6 @@ function formatCompanyResults(payload: unknown, limit?: number): string {
     }
     lines.push("");
   }
-  const cost = asNumber(asObject(asObject(payload)?.costDollars)?.total);
-  if (cost !== undefined) lines.push(`Cost (USD): $${cost.toFixed(4)}`);
   return lines.join("\n").trimEnd();
 }
 
@@ -550,7 +521,7 @@ async function runAnswerSubcommand(ctx: SearchCliContext): Promise<void> {
 function searchHelp(): void {
   console.log(`Usage: dench search <subcommand>
 
-Live web access through the Dench Cloud Gateway (Exa Search). Auths
+Live web access through the Dench Cloud Gateway. Auths
 with DENCH_API_KEY or the active \`dench signin\` agent session. Agent
 sessions require a paid workspace.
 
@@ -582,10 +553,10 @@ Find people or companies (--category people|company):
   published-date filters work with neither. Passing one that does not
   apply is refused rather than silently ignored.
 
-Deep-read one or more URLs (Exa /search/contents):
+Deep-read one or more URLs:
   dench search contents <url> [<url>...] [--max-chars 4000] [--summary "..."] [--json]
 
-One-shot synthesised answer with citations (Exa /search/answer):
+One-shot synthesised answer with citations:
   dench search answer "<query>" [--json]
 
 Environment variables:

package/tools.ts

@@ -53,11 +53,17 @@ import {
   parseJson,
   shift as shiftRaw,
 } from "./lib/cli-args";
+import {
+  type ConnectionSource,
+  connectionSource,
+} from "./lib/connection-source";
 import {
   normalizeUnipileToolkitSlug,
   unipileConnectKindFromToolkitSlug,
 } from "./lib/unipile-toolkits";
 
+export { type ConnectionSource, connectionSource };
+
 // ---------------------------------------------------------------------------
 // Public dispatcher
 // ---------------------------------------------------------------------------
@@ -240,15 +246,15 @@ export async function fetchConnectedAppsSummary(
   available: boolean;
   count: number;
   connections: CompactConnection[];
-  unipileAvailable: boolean;
-  unipileError?: string;
+  nativeAvailable: boolean;
+  nativeError?: string;
   error?: string;
   reason?: string;
 }> {
   const unipile = await fetchUnipileConnections(ctx);
   const unipileFields = {
-    unipileAvailable: unipile.available,
-    ...(unipile.error ? { unipileError: unipile.error } : {}),
+    nativeAvailable: unipile.available,
+    ...(unipile.error ? { nativeError: unipile.error } : {}),
   };
   if (ctx.gatewayAuthError) {
     return {
@@ -310,8 +316,8 @@ async function runStatusSubcommand(ctx: ToolCliContext): Promise<void> {
       available: unipile.available,
       count: unipile.connections.length,
       connections: unipile.connections,
-      unipileAvailable: unipile.available,
-      ...(unipile.error ? { unipileError: unipile.error } : {}),
+      nativeAvailable: unipile.available,
+      ...(unipile.error ? { nativeError: unipile.error } : {}),
     };
   } else {
     connectionsSummary = await fetchConnectedAppsSummary(ctx);
@@ -339,14 +345,14 @@ async function runStatusSubcommand(ctx: ToolCliContext): Promise<void> {
     : allConnections;
 
   const summary = {
-    ok: unipileToolkit ? connectionsSummary.unipileAvailable : true,
+    ok: unipileToolkit ? connectionsSummary.nativeAvailable : true,
     available: connectionsSummary.available,
     toolkit: filterToolkit ?? null,
     count: filteredConnections.length,
     connections: filteredConnections,
-    unipileAvailable: connectionsSummary.unipileAvailable,
-    ...(connectionsSummary.unipileError
-      ? { unipileError: connectionsSummary.unipileError }
+    nativeAvailable: connectionsSummary.nativeAvailable,
+    ...(connectionsSummary.nativeError
+      ? { nativeError: connectionsSummary.nativeError }
       : {}),
     ...(connectionsSummary.error ? { error: connectionsSummary.error } : {}),
     ...(connectionsSummary.reason ? { reason: connectionsSummary.reason } : {}),
@@ -409,8 +415,8 @@ async function runSearchSubcommand(ctx: ToolCliContext): Promise<void> {
       ),
       ...unipile.tools,
     ],
-    unipileAvailable: unipile.available,
-    ...(unipile.error ? { unipileError: unipile.error } : {}),
+    nativeAvailable: unipile.available,
+    ...(unipile.error ? { nativeError: unipile.error } : {}),
   };
 
   if (ctx.jsonOutput) {
@@ -519,7 +525,12 @@ async function fetchUnipileTools(
       available: true,
       tools: rows
         .map((row) => asRecord(row))
-        .filter((row): row is JsonRecord => row !== undefined),
+        .filter((row): row is JsonRecord => row !== undefined)
+        .map((row) =>
+          typeof row.source === "string"
+            ? { ...row, source: connectionSource(row.source, "dench") }
+            : row,
+        ),
     };
   } catch (error) {
     return { available: false, tools: [], error: errorMessage(error) };
@@ -530,7 +541,7 @@ async function runRunSubcommand(ctx: ToolCliContext): Promise<void> {
   const toolSlug = ctx.args[0];
   if (!toolSlug || toolSlug.startsWith("--")) {
     throw new ToolCliError(
-      'Usage: dench tool run <composio_tool_slug> [--args \'{"key":"value"}\'] [--account <connectedAccountId>] [--json]',
+      'Usage: dench tool run <tool_slug> [--args \'{"key":"value"}\'] [--account <connectedAccountId>] [--json]',
     );
   }
   ctx.args.shift();
@@ -659,7 +670,7 @@ async function runSlackConnectSubcommand(
     redirectUrl,
     message,
     note:
-      "Slack is Dench's in-house integration (not Composio). One install powers " +
+      "Slack is Dench's in-house integration. One install powers " +
       "both the Slack messaging channel and the agent SLACK_* tools " +
       "(SLACK_SEND_MESSAGE, SLACK_FETCH_HISTORY, …).",
   };
@@ -669,7 +680,7 @@ async function runSlackConnectSubcommand(
   }
   console.log(message);
   console.log(
-    "Slack is Dench's in-house integration (not Composio). Once an admin installs it,",
+    "Slack is Dench's in-house integration. Once an admin installs it,",
   );
   console.log(
     "run tools with `dench tool run SLACK_SEND_MESSAGE --args '{…}'` — see `dench tool search --toolkit slack`.",
@@ -699,7 +710,7 @@ async function runConnectSubcommand(ctx: ToolCliContext): Promise<void> {
     }
     if (ctx.args.includes("--callback-url")) {
       throw new ToolCliError(
-        "Unipile connections use Dench's managed callback. --callback-url is only supported for Composio integrations.",
+        "Dench-connected accounts use Dench's managed callback. --callback-url is only supported for connected apps.",
       );
     }
     const result = asRecord(
@@ -717,7 +728,7 @@ async function runConnectSubcommand(ctx: ToolCliContext): Promise<void> {
     );
     const redirectUrl = stringField(result, "link");
     if (!redirectUrl) {
-      throw new ToolCliError("Unipile did not return a connection link.");
+      throw new ToolCliError("Dench did not return a connection link.");
     }
     const message = `Connect ${toolkit} here: ${redirectUrl}`;
     if (ctx.jsonOutput) {
@@ -725,7 +736,7 @@ async function runConnectSubcommand(ctx: ToolCliContext): Promise<void> {
         JSON.stringify(
           {
             ok: true,
-            source: "unipile",
+            source: "dench",
             toolkit: normalizeUnipileToolkitSlug(toolkit),
             redirectUrl,
             expiresAt: result?.expiresAt,
@@ -845,9 +856,7 @@ class GatewayHttpError extends ToolCliError {
   constructor(args: { status: number; body: string; path: string }) {
     const truncated =
       args.body.length > 500 ? `${args.body.slice(0, 500)}…` : args.body;
-    super(
-      `Gateway ${args.path} returned ${args.status}: ${truncated || "(empty)"}`,
-    );
+    super(`Dench gateway error (${args.status}): ${truncated || "(empty)"}`);
     this.name = "GatewayHttpError";
     this.status = args.status;
     this.body = args.body;
@@ -1093,12 +1102,12 @@ function extractToolkits(payload: unknown): JsonRecord[] {
 }
 
 /**
- * The merged row shape. `source` is the discriminator: `composio` rows carry a
+ * The merged row shape. `source` is the discriminator: `app` rows carry a
  * routable `connectedAccountId` (usable as `dench tool run --account`), while
- * `unipile` rows never do — their account id is an internal credential.
+ * `dench` rows never do — their account id is an internal credential.
  */
 export type CompactConnection = {
-  source: "composio" | "unipile";
+  source: ConnectionSource;
   toolkit: string;
   status: string;
   connectedAccountId: string | null;
@@ -1115,7 +1124,7 @@ export type CompactConnection = {
 
 function compactConnection(connection: JsonRecord): CompactConnection {
   return {
-    source: "composio",
+    source: connectionSource(connection.source, "app"),
     toolkit:
       stringField(connection, "toolkit_slug", "toolkit") ??
       stringField(asRecord(connection.toolkit), "slug", "name") ??
@@ -1135,7 +1144,7 @@ function compactConnection(connection: JsonRecord): CompactConnection {
 
 function compactUnipileConnection(connection: JsonRecord): CompactConnection {
   return {
-    source: "unipile",
+    source: connectionSource(connection.source, "dench"),
     toolkit: stringField(connection, "toolkit") ?? "unknown",
     status: stringField(connection, "status") ?? "unknown",
     connectedAccountId: null,
@@ -1153,11 +1162,11 @@ function formatConnectionLine(connection: CompactConnection): string {
     : "";
   // "via Dench" both names the broker and explains why the row has no
   // connected-account id to pass to `dench tool run`.
-  const via = connection.source === "unipile" ? " via Dench" : "";
+  const via = connection.source === "dench" ? " via Dench" : "";
   // Whose mailbox/LinkedIn it is only matters when it is not this agent's —
   // `dench email --mailbox` picks between them.
   const owner =
-    connection.source === "unipile" &&
+    connection.source === "dench" &&
     connection.isOwner === false &&
     connection.ownerName
       ? ` · ${connection.ownerName}`
@@ -1172,8 +1181,8 @@ function formatStatusSummary(summary: {
   toolkit: string | null;
   count: number;
   connections: CompactConnection[];
-  unipileAvailable?: boolean;
-  unipileError?: string;
+  nativeAvailable?: boolean;
+  nativeError?: string;
   reason?: string;
   error?: string;
 }): string {
@@ -1190,16 +1199,16 @@ function formatStatusSummary(summary: {
   }
   // Say so rather than silently listing Composio only — otherwise a connected
   // calendar reads as absent, which is the failure this merge exists to fix.
-  if (summary.unipileAvailable === false) {
+  if (summary.nativeAvailable === false) {
     lines.push(
       `  (could not check Gmail/Outlook/Calendar/LinkedIn: ${
-        summary.unipileError ?? "unknown error"
+        summary.nativeError ?? "unknown error"
       })`,
     );
   }
   if (summary.reason || summary.error) {
     lines.push(
-      `  (could not check Composio integrations: ${summary.reason ?? summary.error})`,
+      `  (could not check connected apps: ${summary.reason ?? summary.error})`,
     );
   }
   return lines.join("\n");
@@ -1234,8 +1243,8 @@ function formatSearchResult(searchResult: unknown, compact = false): string {
     return [
       "No matching tools found.",
       "",
-      "`dench tool search` is a KEYWORD search over Composio's tool",
-      "names and descriptions, not a semantic / natural-language search.",
+      "`dench tool search` is a KEYWORD search over tool names and",
+      "descriptions, not a semantic / natural-language search.",
       "Retry with one or two concrete tokens that likely appear in the",
       'tool slug or its docs ("fetch emails", "send message", "create',
       'issue", "list channels"). Drop filter words like "today" /',
@@ -1361,18 +1370,18 @@ Usage:
 
 Notes:
   All commands authenticate with DENCH_API_KEY or the active \`dench signin\`
-  agent session. Composio commands use paid-workspace gateway credentials.
+  agent session. Connected-app commands use paid-workspace gateway credentials.
   Native Gmail/Outlook/Calendar/LinkedIn connect/status need no gateway key;
   connect requires a workspace member or a member-owned Dench API key.
-  Results carry a "source". "composio" rows are brokered by Composio; "unipile"
-  rows (gmail, outlook, calendar, linkedin) and "dench" rows (slack) are
-  connected by Dench itself. ALL of them run through \`dench tool run\` with the
+  Results carry a "source". "app" rows are third-party connected apps; "dench"
+  rows (gmail, outlook, calendar, linkedin, slack) are connected by Dench
+  itself. ALL of them run through \`dench tool run\` with the
   same slug + --args contract. \`dench tool connect slack\` prints the in-house
   Slack install URL (org admin, one click). For gmail/outlook/calendar/linkedin,
-  connect prints a Unipile hosted-auth link using the web app's configuration.
+  connect prints a Dench sign-in link using the web app's configuration.
   Sign in as a workspace member and open the link to authorize the account.
   Calendar status accepts calendar, google-calendar, or outlook-calendar.
-  Other toolkits connect through Composio; --callback-url applies only to them.
+  Other toolkits connect as connected apps; --callback-url applies only to them.
   Slack is ALWAYS in-house: SLACK_* slugs (SLACK_SEND_MESSAGE with Block Kit
   blocks/buttons, SLACK_FETCH_HISTORY, SLACK_LIST_CHANNELS, …) run through the
   org's own Slack app install and can post to / read any channel.

package/web.ts

@@ -144,7 +144,7 @@ through the Dench gateway. Prefer these over writing your own scraper.
   dench web brand-search <query> [--json]
 
 Crawl defaults to 15 pages and is hard-capped at 50. Search stays on
-\`dench search\` (Exa). \`dench context\` is workspace orientation, not this.
+\`dench search\`. \`dench context\` is workspace orientation, not this.
 `);
 }