@dench.com/cli 3.6.3-staging.372 → 3.6.5-staging.384

package/dench.ts

@@ -32,7 +32,6 @@ import { cliVersion } from "./lib/cli-version";
 import { denchConfigDirectory } from "./lib/config-path.mjs";
 import { resolveOrganizationBySelector } from "./lib/organizationSelector";
 import { backendErrorText } from "./lib/public-error";
-import { normalizeUnipileToolkitSlug } from "./lib/unipile-toolkits";
 import { formatApprovalOpenMessage, openUrl } from "./openUrl";
 import {
   explicitSessionKeyInput,
@@ -176,6 +175,9 @@ const api = {
       ),
     },
     agentConfig: {
+      workspaceContext: makeFunctionReference<"query">(
+        "functions/agentConfig:workspaceContext",
+      ),
       workspaceInstructions: makeFunctionReference<"query">(
         "functions/agentConfig:workspaceInstructions",
       ),
@@ -465,6 +467,7 @@ Usage:
   dench logout [session-key-or-workspace-slug] [--session <key-or-scope>] [--host <host>] [--all] [--json]
   dench backend [show|set|clear] [<production|staging|local|<url>>] [--json]
   dench context [--instructions] [--json]
+  dench context --sections organisation,user,memory [--json]
   dench instructions [--json]
   dench status [--mine|--self] [--json]
   dench memory search "query" [--limit 8] [--json]
@@ -742,6 +745,7 @@ function contextHelp() {
 
 Usage:
   dench context [--instructions] [--json]
+  dench context --sections organisation,user,memory [--json]
   dench instructions [--json]
 
 Shows the current workspace, current agent, assigned tasks, pending approvals
@@ -3222,19 +3226,22 @@ function formatContext(context: JsonRecord) {
 
 async function buildWorkspaceInstructionsContext(
   runtime: Awaited<ReturnType<typeof getRuntime>>,
+  sections?: string[],
 ) {
   if (runtime.mode === "dev") {
     return (await runtime.client.query(
       api.functions.agentConfig.devWorkspaceInstructions,
-      runtime.workspaceArgs,
+      { ...runtime.workspaceArgs, ...(sections ? { sections } : {}) },
     )) as JsonRecord;
   }
   if (runtime.mode !== "session" && runtime.mode !== "apiKey") {
     throw loginRequiredError("dench context --instructions");
   }
   return (await runtime.client.query(
-    api.functions.agentConfig.workspaceInstructions,
-    { sessionToken: runtime.sessionToken },
+    sections
+      ? api.functions.agentConfig.workspaceContext
+      : api.functions.agentConfig.workspaceInstructions,
+    { sessionToken: runtime.sessionToken, ...(sections ? { sections } : {}) },
   )) as JsonRecord;
 }
 
@@ -3550,7 +3557,8 @@ async function runFilesLs() {
   const rows = recursive
     ? await listConvexTreeRecursive(runtime, apiKey, target)
     : await listConvexTreeAt(runtime, apiKey, target);
-  if (hasFlag("--json")) {
+  // Inline handlers share the top-level flag; filteredArgs omits --json.
+  if (json) {
     print({
       ok: true,
       prefix: target,
@@ -3670,7 +3678,7 @@ async function runFilesRm() {
   );
   const self = parentRows.find((row) => row.path === target);
   if (!self) {
-    if (hasFlag("--json")) {
+    if (json) {
       print({ ok: true, path: target, removedFiles: 0, removedDirs: 0 });
     } else {
       process.stdout.write(
@@ -3772,7 +3780,7 @@ async function runFilesCat() {
     });
   }
 
-  if (hasFlag("--json")) {
+  if (json) {
     print({ ok: true, ...file });
     return;
   }
@@ -3822,7 +3830,7 @@ async function runFilesWrite() {
     } as never,
   )) as { path: string; contentHash: string };
 
-  if (hasFlag("--json")) {
+  if (json) {
     print({ ok: true, ...result, bytes: content.length });
     return;
   }
@@ -3850,7 +3858,7 @@ async function runFilesDownload() {
     );
   }
   const target = normalizeFilesPath(targetRaw);
-  const jsonOut = hasFlag("--json");
+  const jsonOut = json;
 
   if (hasFlag("--url")) {
     const url = (await runtime.client.action(
@@ -4800,7 +4808,14 @@ async function main() {
       | Awaited<ReturnType<typeof resolveGatewayCommandAuth>>
       | undefined;
     try {
-      gatewayAuth = await resolveGatewayCommandAuth(runtime, "dench email");
+      if (
+        subArgs[0] !== "draft" &&
+        !subArgs.some(
+          (arg) => arg === "--mailbox" || arg.startsWith("--mailbox="),
+        )
+      ) {
+        gatewayAuth = await resolveGatewayCommandAuth(runtime, "dench email");
+      }
     } catch {
       gatewayAuth = undefined;
     }
@@ -4881,35 +4896,16 @@ async function main() {
       if (argsIndex !== -1) parseJson(filteredSubArgs[argsIndex + 1]);
     }
     const runtime = await getRuntime();
-    const isSlackConnect =
-      sub === "connect" &&
-      ["slack", "slackbot"].includes(
-        (filteredSubArgs[1] ?? "").trim().toLowerCase(),
-      );
-    const isUnipileCommand =
-      (sub === "connect" || sub === "status") &&
-      normalizeUnipileToolkitSlug(filteredSubArgs[1] ?? "") !== null;
-    let gatewayAuth: GatewayCommandAuth | null = null;
-    let gatewayAuthError: string | undefined;
-    if (!isSlackConnect && !isUnipileCommand) {
-      try {
-        gatewayAuth = await resolveGatewayCommandAuth(runtime, "dench tool");
-      } catch (error) {
-        if (sub !== "status") throw error;
-        gatewayAuthError = gatewayAuthFailureReason(error);
-      }
-    }
     await runToolCommand({
       args: filteredSubArgs,
       jsonOutput: json,
-      gatewayAuthError,
-      ...(gatewayAuth
-        ? {
-            bearerToken: gatewayAuth.bearerToken,
-            gatewayBaseUrl: gatewayAuth.gatewayBaseUrl,
-            gatewayHeaders: gatewayAuth.gatewayHeaders,
-          }
-        : {}),
+      resolveGatewayAuth: async () => {
+        try {
+          return await resolveGatewayCommandAuth(runtime, "dench tool");
+        } catch (error) {
+          return { gatewayAuthError: gatewayAuthFailureReason(error) };
+        }
+      },
       ...unipileQueryAuth(runtime),
       ...(runtime.mode !== "dev"
         ? {
@@ -5260,6 +5256,44 @@ async function main() {
     return;
   }
 
+  if (command === "context" && args.includes("--sections")) {
+    const raw = args[args.indexOf("--sections") + 1];
+    const sections = raw
+      ?.split(",")
+      .map((section) => section.trim().toLowerCase())
+      .filter(Boolean);
+    const allowed = [
+      "identity",
+      "organisation",
+      "user",
+      "memory",
+      "rules",
+      "tools",
+    ];
+    if (
+      !sections?.length ||
+      sections.some((section) => !allowed.includes(section))
+    )
+      throw new Error(
+        `Usage: dench context --sections ${allowed.join(",")} [--json]`,
+      );
+    const context = await buildWorkspaceInstructionsContext(runtime, [
+      ...new Set(sections),
+    ]);
+    const documents = Array.isArray(context.documents)
+      ? (context.documents as Array<{ name: string; content?: string }>)
+      : [];
+    print(
+      json
+        ? context
+        : documents
+            .filter((doc) => doc.content !== undefined)
+            .map((doc) => `## ${doc.name}\n${doc.content || "(empty)"}`)
+            .join("\n\n"),
+    );
+    return;
+  }
+
   if (command === "context" && args.includes("--instructions")) {
     const instructions = await buildWorkspaceInstructionsContext(runtime);
     print(

package/email.ts

@@ -1,7 +1,15 @@
-import { readFile } from "node:fs/promises";
+import { createHash, createHmac, randomUUID } from "node:crypto";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { basename, extname, join } from "node:path";
 import type { ConvexHttpClient } from "convex/browser";
 import { makeFunctionReference } from "convex/server";
-import { getFlag, hasFlag, parseJson } from "./lib/cli-args";
+import {
+  assertNoUnknownFlags,
+  getFlag,
+  hasFlag,
+  parseJson,
+} from "./lib/cli-args";
+import { denchConfigDirectory } from "./lib/config-path.mjs";
 
 type EmailCliContext = {
   convex: ConvexHttpClient;
@@ -358,6 +366,13 @@ export function emailHelp() {
   console.log(`dench email — outbound email from a connected inbox (or Dench Emailing Service)
 
 Usage:
+  dench email draft create --to <email> --subject <subject> --text <body> [--mailbox <id/email>] [--request-id <id>] [--json]
+  dench email draft show <id> [--json]
+  dench email draft update|send <id> --revision <n> [--json]
+  dench email draft attach <id> --revision <n> --file <path> [--content-type <mime>] [--json]  # up to 5 MB/file
+  dench email draft signature <id> [--json]  # read signature HTML; insert visibly into the body
+  # Identical native create/send invocations reuse a saved request ID. Use --request-id <new-id> for another identical email.
+  dench email send --mailbox <id/email> --to <email> --subject <subject> --text <body> [--request-id <id>] [--json]
   dench email identity verify --from founder@example.com [--private] [--json]
   dench email identity verify --domain example.com [--from founder@example.com] [--private] [--json]
   dench email identity list [--domain example.com] [--json]
@@ -432,11 +447,20 @@ Email + LinkedIn multichannel sequences (see \`dench campaign\` — the fuller s
 }
 
 export async function runEmailCommand(ctx: EmailCliContext): Promise<void> {
+  ctx.args = ctx.args.flatMap((arg) => {
+    const split = arg.startsWith("--") ? arg.indexOf("=") : -1;
+    return split > 2 ? [arg.slice(0, split), arg.slice(split + 1)] : [arg];
+  });
+  ctx.jsonOutput = hasFlag(ctx.args, "--json") || ctx.jsonOutput;
   const group = ctx.args.shift();
   if (!group || group === "help" || group === "--help" || group === "-h") {
     emailHelp();
     return;
   }
+  if (group === "draft") {
+    await runDraft(ctx);
+    return;
+  }
   if (group === "identity") {
     await runIdentity(ctx);
     return;
@@ -500,6 +524,17 @@ function parseAddressList(
 }
 
 async function runSend(ctx: EmailCliContext) {
+  if (ctx.args.includes("--mailbox")) {
+    const content = {
+      ...(await draftContent(ctx)),
+      mailbox: requiredFlag(ctx.args, "--mailbox"),
+      threadId: getFlag(ctx.args, "--thread") ?? process.env.DENCH_THREAD_ID,
+      mode: "send",
+    };
+    const payload = await createNativeEmail(ctx, content);
+    out(ctx, payload, JSON.stringify(payload, null, 2));
+    return;
+  }
   const from = requiredFlag(ctx.args, "--from");
   const to = parseAddressList(requiredFlag(ctx.args, "--to"));
   if (to.length === 0) {
@@ -540,6 +575,176 @@ async function runSend(ctx: EmailCliContext) {
   );
 }
 
+/** Persist before HTTP. Identical invocations recover the same request even
+ * after the CLI process dies; an explicit new --request-id starts another email. */
+async function createNativeEmail(ctx: EmailCliContext, content: JsonRecord) {
+  let requestId = getFlag(ctx.args, "--request-id");
+  assertEmailArgs(ctx);
+  if (!requestId) {
+    // The credential keys the receipt fingerprint; it is never serialized into
+    // receipt data. Different sessions must not reuse one another's request IDs.
+    const fingerprint = ctx.sessionToken
+      ? createHmac("sha256", ctx.sessionToken)
+      : createHash("sha256");
+    const key = fingerprint
+      .update(JSON.stringify([ctx.convex.url, content]))
+      .digest("hex");
+    const directory = join(denchConfigDirectory(), "email-requests");
+    await mkdir(directory, { recursive: true, mode: 0o700 });
+    const path = join(directory, `${key}.json`);
+    const proposed = randomUUID();
+    try {
+      await writeFile(path, JSON.stringify({ requestId: proposed }), {
+        flag: "wx",
+        mode: 0o600,
+      });
+    } catch (error) {
+      if ((error as NodeJS.ErrnoException).code !== "EEXIST") throw error;
+    }
+    const saved = JSON.parse(await readFile(path, "utf8")) as {
+      requestId: string;
+    };
+    if (typeof saved.requestId !== "string" || !saved.requestId)
+      throw new EmailCliError("Invalid local email request receipt");
+    requestId = saved.requestId;
+  }
+  return await callMutation(ctx, "functions/emailDrafts:create", {
+    ...content,
+    requestId,
+  });
+}
+
+function assertEmailArgs(ctx: EmailCliContext) {
+  assertNoUnknownFlags(ctx.args, "dench email");
+  if (ctx.args.length)
+    throw new EmailCliError(`Unexpected argument: ${ctx.args[0]}`);
+}
+
+function draftIdArg(ctx: EmailCliContext) {
+  const positional =
+    ctx.args[0] && !ctx.args[0].startsWith("--") ? ctx.args.shift() : undefined;
+  return positional ?? requiredFlag(ctx.args, "--draft");
+}
+
+function revisionArg(ctx: EmailCliContext) {
+  const revision = Number(requiredFlag(ctx.args, "--revision"));
+  if (!Number.isSafeInteger(revision) || revision < 1)
+    throw new EmailCliError(
+      "--revision must be a positive integer from draft show",
+    );
+  return revision;
+}
+
+async function draftContent(ctx: EmailCliContext) {
+  const to = getFlag(ctx.args, "--to");
+  const cc = getFlag(ctx.args, "--cc");
+  const bcc = getFlag(ctx.args, "--bcc");
+  const subject = getFlag(ctx.args, "--subject");
+  const htmlBody = await readTextFlag(ctx.args, "--html", "--html-file");
+  const textBody = await readTextFlag(ctx.args, "--text", "--text-file");
+  return {
+    ...(to !== undefined ? { to: parseAddressList(to) } : {}),
+    ...(cc !== undefined ? { cc: parseAddressList(cc) } : {}),
+    ...(bcc !== undefined ? { bcc: parseAddressList(bcc) } : {}),
+    ...(subject !== undefined ? { subject } : {}),
+    ...(htmlBody !== undefined ? { htmlBody } : {}),
+    ...(textBody !== undefined ? { textBody } : {}),
+  };
+}
+
+async function runDraft(ctx: EmailCliContext) {
+  const sub = ctx.args.shift();
+  let result: unknown;
+  if (sub === "create") {
+    result = await createNativeEmail(ctx, {
+      ...(await draftContent(ctx)),
+      mailbox: getFlag(ctx.args, "--mailbox"),
+      threadId: getFlag(ctx.args, "--thread") ?? process.env.DENCH_THREAD_ID,
+    });
+  } else if (sub === "show" || sub === "signature") {
+    const draftId = draftIdArg(ctx);
+    assertEmailArgs(ctx);
+    result =
+      sub === "show"
+        ? await callQuery(ctx, "functions/emailDrafts:get", { draftId })
+        : await callAction(ctx, "functions/emailDraftsNode:loadSignature", {
+            draftId,
+          });
+  } else if (sub === "update" || sub === "send") {
+    const draftId = draftIdArg(ctx);
+    const expectedRevision = revisionArg(ctx);
+    const args =
+      sub === "update"
+        ? {
+            draftId,
+            expectedRevision,
+            patch: {
+              ...(await draftContent(ctx)),
+              mailboxAccountId: getFlag(ctx.args, "--mailbox"),
+            },
+          }
+        : {
+            draftId,
+            expectedRevision,
+            requestId: getFlag(ctx.args, "--request-id"),
+          };
+    assertEmailArgs(ctx);
+    result = await callMutation(ctx, `functions/emailDrafts:${sub}`, args);
+  } else if (sub === "attach") {
+    const draftId = draftIdArg(ctx);
+    const expectedRevision = revisionArg(ctx);
+    const file = requiredFlag(ctx.args, "--file");
+    const contentType =
+      getFlag(ctx.args, "--content-type") ??
+      (
+        {
+          ".txt": "text/plain",
+          ".csv": "text/csv",
+          ".pdf": "application/pdf",
+          ".png": "image/png",
+          ".jpg": "image/jpeg",
+          ".jpeg": "image/jpeg",
+          ".json": "application/json",
+          ".html": "text/html",
+        } as Record<string, string>
+      )[extname(file).toLowerCase()] ??
+      "application/octet-stream";
+    assertEmailArgs(ctx);
+    const bytes = await readFile(file);
+    if (bytes.length > 5 * 1024 * 1024)
+      throw new EmailCliError("Attachments can be up to 5 MB each");
+    const draft = (await callQuery(ctx, "functions/emailDrafts:get", {
+      draftId,
+    })) as { revision: number; attachments: unknown[]; canEdit: boolean };
+    if (draft.revision !== expectedRevision)
+      throw new EmailCliError("Draft changed. Refresh before attaching a file");
+    if (!draft.canEdit) throw new EmailCliError("This draft is read-only");
+    const attachment = await callAction(
+      ctx,
+      "functions/emailDraftsNode:uploadAttachment",
+      {
+        draftId,
+        name: basename(file),
+        contentType,
+        contentBase64: bytes.toString("base64"),
+      },
+    );
+    result = await callMutation(ctx, "functions/emailDrafts:update", {
+      draftId,
+      expectedRevision,
+      patch: { attachments: [...draft.attachments, attachment] },
+    });
+  } else if (sub === "senders") {
+    assertEmailArgs(ctx);
+    result = await callQuery(ctx, "functions/emailDrafts:listSenders", {});
+  } else {
+    throw new EmailCliError(
+      "Usage: dench email draft create|show|update|send|senders|attach|signature. update/send/attach require --revision from draft show. attach: --file <path> [--content-type <mime>]. create: --to --subject --text/--html [--mailbox <id/email>] [--request-id <stable-id>] [--thread <chat-id>].",
+    );
+  }
+  out(ctx, result, JSON.stringify(result, null, 2));
+}
+
 async function runMessage(ctx: EmailCliContext) {
   const sub = ctx.args.shift();
   if (sub === "status") {

package/lib/api-schemas.ts

@@ -31,6 +31,42 @@ import {
   MIN_WITHDRAW_AFTER_HOURS,
 } from "./campaign-steps";
 
+const nativeEmailRecipient = z.object({
+  email: z.string(),
+  name: z.string().optional(),
+});
+const nativeEmailAttachment = z.object({
+  storageId: z.string(),
+  name: z.string(),
+  contentType: z.string(),
+  size: z.number(),
+});
+const nativeEmailContent = {
+  to: z.array(nativeEmailRecipient).optional(),
+  cc: z.array(nativeEmailRecipient).optional(),
+  bcc: z.array(nativeEmailRecipient).optional(),
+  subject: z.string().optional(),
+  htmlBody: z.string().optional(),
+  textBody: z.string().optional(),
+  attachments: z.array(nativeEmailAttachment).optional(),
+};
+const nativeEmailCreate = z.object({
+  organizationId: z.string().optional(),
+  threadId: z.string().optional(),
+  mailbox: z.string().optional(),
+  requestId: z.string(),
+  ...nativeEmailContent,
+});
+const nativeEmailReceipt = z
+  .object({
+    ok: z.boolean(),
+    kind: z.literal("email"),
+    draftId: z.string(),
+    syncStatus: z.string(),
+    revision: z.number(),
+  })
+  .passthrough();
+
 // ---------------------------------------------------------------------------
 // Shared enums + fragments (mirror convex validators)
 // ---------------------------------------------------------------------------
@@ -1786,7 +1822,11 @@ const toolSearchResponse = z
     session: z
       .object({ id: z.string() })
       .passthrough()
+      .optional()
       .describe("Tool-router session; reuse session.id for follow-up calls."),
+    items: z.array(z.record(z.string(), z.unknown())).optional(),
+    nativeAvailable: z.boolean().optional(),
+    available: z.boolean().optional(),
     execution_ref_version: z.number().optional(),
   })
   .passthrough()
@@ -2022,13 +2062,27 @@ const imageEdit = imageGenerate.extend({
   mask_base64: z.string().optional().describe("Optional base64 mask image."),
 });
 
-const composioConnect = z.object({
-  toolkit: z
-    .string()
-    .min(1)
-    .describe("Toolkit slug, e.g. github, gmail, stripe."),
-  callback_url: z.string().optional().describe("Optional OAuth callback URL."),
-});
+const composioConnect = z
+  .object({
+    toolkit: z
+      .string()
+      .min(1)
+      .optional()
+      .describe("Toolkit slug, e.g. github, gmail, stripe."),
+    toolkit_slug: z.string().min(1).optional(),
+    callback_url: z
+      .string()
+      .optional()
+      .describe("Optional OAuth callback URL."),
+    returnTo: z
+      .string()
+      .optional()
+      .describe("Native OAuth return path within the workspace."),
+  })
+  .refine((value) => Boolean(value.toolkit || value.toolkit_slug), {
+    message: "A toolkit is required.",
+    path: ["toolkit"],
+  });
 
 const composioToolSearch = z.object({
   queries: z
@@ -2039,7 +2093,13 @@ const composioToolSearch = z.object({
       }),
     )
     .min(1)
-    .max(7),
+    .max(7)
+    .optional(),
+  query: z.string().min(1).optional(),
+  toolkit: z.string().min(1).optional(),
+  toolkit_slug: z.string().min(1).optional(),
+  limit: z.number().int().min(1).max(100).optional(),
+  important: z.boolean().optional(),
   session: z
     .object({ id: z.string().optional(), generate_id: z.boolean().optional() })
     .optional(),
@@ -2064,6 +2124,8 @@ const composioToolRun = z.object({
     .optional()
     .describe("Tool arguments object."),
   account: z.string().optional(),
+  connected_account_id: z.string().optional(),
+  approvalId: z.string().optional(),
 });
 
 /**
@@ -3315,8 +3377,47 @@ export const requestSchemas: Record<string, ZodTypeAny> = {
   }),
 
   // Workspace
+  "workspace.context.sections": z.object({
+    organizationId: z.string().optional(),
+    sections: z
+      .array(
+        z.enum([
+          "identity",
+          "organisation",
+          "user",
+          "memory",
+          "rules",
+          "tools",
+        ]),
+      )
+      .optional(),
+  }),
+  "email.drafts.create": nativeEmailCreate,
+  "email.native.send": nativeEmailCreate,
+  "email.drafts.get": z.object({ draftId: z.string() }),
+  "email.drafts.senders": z.object({ organizationId: z.string().optional() }),
+  "email.drafts.update": z.object({
+    draftId: z.string(),
+    expectedRevision: z.number().int().nonnegative(),
+    patch: z.object({
+      mailboxAccountId: z.string().optional(),
+      ...nativeEmailContent,
+    }),
+  }),
+  "email.drafts.send": z.object({
+    draftId: z.string(),
+    expectedRevision: z.number().int().nonnegative(),
+    requestId: z.string().optional(),
+  }),
+  "email.drafts.upload": z.object({
+    draftId: z.string(),
+    name: z.string(),
+    contentType: z.string(),
+    contentBase64: z.string(),
+  }),
+  "email.drafts.signature": z.object({ draftId: z.string() }),
   "workspace.context": noInput,
-  "workspace.instructions": noInput,
+  "workspace.instructions": z.object({ organizationId: z.string().optional() }),
   "workspace.status": noInput,
   "workspace.agents": noInput,
   "workspace.approvals.list": noInput,
@@ -5055,6 +5156,15 @@ export const responseSchemas: Record<string, ZodTypeAny> = {
   }),
 
   // Workspace orientation
+  "workspace.context.sections": z.object({}).passthrough(),
+  "email.drafts.create": nativeEmailReceipt,
+  "email.drafts.get": nativeEmailReceipt,
+  "email.drafts.update": nativeEmailReceipt,
+  "email.drafts.send": nativeEmailReceipt,
+  "email.native.send": nativeEmailReceipt,
+  "email.drafts.senders": z.array(z.object({}).passthrough()),
+  "email.drafts.upload": nativeEmailAttachment,
+  "email.drafts.signature": z.object({}).passthrough(),
   "workspace.context": workspaceStatusPayload,
   "workspace.instructions": workspaceInstructionsResponse,
   "workspace.status": workspaceStatusPayload,
@@ -5865,6 +5975,14 @@ export const responseSchemas: Record<string, ZodTypeAny> = {
         .optional()
         .describe("OAuth URL the user opens to finish connecting."),
       connection_id: z.string().optional(),
+      redirectUrl: z.string().optional(),
+      link: z.string().optional(),
+      artifact: z
+        .object({
+          kind: z.literal("connect"),
+          data: z.object({ toolkit: z.string() }),
+        })
+        .optional(),
     })
     .passthrough()
     .describe("Connect-link response."),