@settlemint/dalp-cli 3.1.32-main.42884423762 → 3.1.32-main.42904215559

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@settlemint/dalp-cli",
-  "version": "3.1.32-main.42884423762",
+  "version": "3.1.32-main.42904215559",
   "private": false,
   "description": "CLI for the Digital Asset Lifecycle Platform — manage tokens, identities, compliance, and more from the command line.",
   "homepage": "https://settlemint.com",
@@ -50,14 +50,14 @@
   },
   "dependencies": {
     "@modelcontextprotocol/server": "2.4.0",
-    "@settlemint/dalp-sdk": "3.1.32-main.42884423762",
+    "@settlemint/dalp-sdk": "3.1.32-main.42904215559",
     "incur": "0.7.1",
     "zod": "4.6.7"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",
-    "@testkit/effect-bun-test": "3.1.32-main.42884423762",
-    "@tools/typescript-config": "3.1.32-main.42884423762",
+    "@testkit/effect-bun-test": "3.1.32-main.42904215559",
+    "@tools/typescript-config": "3.1.32-main.42904215559",
     "@types/bun": "1.4.4",
     "publint": "0.3.25"
   },

package/src/lib/cli-cta.ts

@@ -259,6 +259,30 @@ export function buildErrorCta(input: {
   };
 }
 
+function formatCtaCommand(cliName: string, entry: CliCtaCommand): { command: string; description?: string } {
+  if (typeof entry === "string") {
+    return { command: `${cliName} ${entry}` };
+  }
+  const prefixed = entry.command === cliName || entry.command.startsWith(`${cliName} `);
+  let command = prefixed ? entry.command : `${cliName} ${entry.command}`;
+  for (const [key, value] of Object.entries(entry.args ?? {})) {
+    command += value === true ? ` <${key}>` : ` ${String(value)}`;
+  }
+  for (const [key, value] of Object.entries(entry.options ?? {})) {
+    command += value === true ? ` --${key} <${key}>` : ` --${key} ${String(value)}`;
+  }
+  return entry.description === undefined ? { command } : { command, description: entry.description };
+}
+
+export function renderCtaText(cliName: string, block: CliCtaBlock): string {
+  const commands = block.commands.map((entry) => formatCtaCommand(cliName, entry));
+  const width = Math.max(0, ...commands.map((entry) => entry.command.length));
+  const lines = commands.map((entry) =>
+    entry.description === undefined ? `  ${entry.command}` : `  ${entry.command.padEnd(width)}  # ${entry.description}`
+  );
+  return [block.description, ...lines].join("\n");
+}
+
 export function buildSuccessCtaFromResult(result: unknown): CliCtaBlock | undefined {
   const links = extractResourceLinks(result);
   const commands = commandsFromLinks(links);

package/src/lib/register-operations.ts

@@ -1,6 +1,6 @@
 import type { DalpClient } from "@settlemint/dalp-sdk";
 import { Cli, z } from "incur";
-import { buildErrorCta, buildSuccessCtaFromResult, type CliCtaBlock } from "./cli-cta.ts";
+import { buildErrorCta, buildSuccessCtaFromResult, renderCtaText, type CliCtaBlock } from "./cli-cta.ts";
 import { createCliStatus } from "./cli-status.ts";
 import { renderSdkErrorForCli } from "./errors.ts";
 import { INDEX_COMMAND } from "@settlemint/dalp-sdk/routes";
@@ -40,6 +40,14 @@ function withSuccessCta<T extends object>(context: T, data: unknown): unknown {
 
 export type ApiBag = LooseBag;
 
+interface CliRefusal {
+  readonly code: string;
+  readonly message: string;
+  readonly retryable?: boolean;
+  readonly exitCode?: number;
+  readonly cta?: CliCtaBlock;
+}
+
 interface McpAnnotations {
   readonly readOnlyHint: boolean;
   readonly destructiveHint?: boolean;
@@ -55,13 +63,8 @@ export interface CommandTreeNode {
   operations: Array<OperationDescriptor>;
 }
 
-const isSseResult = (value: unknown): value is { readonly stream: AsyncIterable<unknown> } => {
-  if (typeof value !== "object" || value === null || !("stream" in value)) {
-    return false;
-  }
-  const stream = Reflect.get(value, "stream");
-  return typeof stream === "object" && stream !== null && Symbol.asyncIterator in stream;
-};
+const isSseResult = (value: unknown): value is AsyncIterable<unknown> =>
+  typeof value === "object" && value !== null && Symbol.asyncIterator in value;
 
 function pickPrimaryOp(ops: ReadonlyArray<OperationDescriptor>): OperationDescriptor {
   return [...ops].sort((left, right) => right.surface.pathParams.length - left.surface.pathParams.length)[0]!;
@@ -274,17 +277,18 @@ function makeLeafHandler(ops: ReadonlyArray<OperationDescriptor>) {
       options?: unknown;
       request?: Request;
       agent?: boolean;
-      error: (error: {
-        code: string;
-        message: string;
-        retryable?: boolean;
-        exitCode?: number;
-        cta?: CliCtaBlock;
-      }) => unknown;
+      displayName?: string;
+      error: (error: { code: string; message: string; retryable?: boolean; exitCode?: number }) => unknown;
     }) {
+      const refuseWithGuidanceInMessage = ({ cta, ...error }: CliRefusal) =>
+        c.error(
+          cta === undefined
+            ? error
+            : { ...error, message: `${error.message}\n\n${renderCtaText(c.displayName ?? "dalp", cta)}` }
+        );
       const { client } = c.var;
       if (client === undefined) {
-        return c.error({
+        return refuseWithGuidanceInMessage({
           code: "NOT_AUTHENTICATED",
           message: "Not logged in. Run 'dalp login' to authenticate.",
           retryable: true,
@@ -325,7 +329,7 @@ function makeLeafHandler(ops: ReadonlyArray<OperationDescriptor>) {
               if (failedEvent !== undefined) {
                 yield failedEvent;
               }
-              return c.error({
+              return refuseWithGuidanceInMessage({
                 code: "kit.cli.MISSING_PATH",
                 message: `Operation ${descriptor.name} requires path parameters.`,
                 retryable: true,
@@ -347,7 +351,7 @@ function makeLeafHandler(ops: ReadonlyArray<OperationDescriptor>) {
                 yield failedEvent;
               }
               const message = error instanceof Error ? error.message : "Invalid path parameters";
-              return c.error({
+              return refuseWithGuidanceInMessage({
                 code: "kit.cli.INVALID_PATH",
                 message,
                 retryable: true,
@@ -375,7 +379,7 @@ function makeLeafHandler(ops: ReadonlyArray<OperationDescriptor>) {
             yield failedEvent;
           }
           const message = error instanceof Error ? error.message : "Invalid query parameters";
-          return c.error({
+          return refuseWithGuidanceInMessage({
             code: "kit.cli.INVALID_QUERY",
             message,
             retryable: true,
@@ -401,7 +405,7 @@ function makeLeafHandler(ops: ReadonlyArray<OperationDescriptor>) {
             yield failedEvent;
           }
           const message = error instanceof Error ? error.message : "Invalid request body";
-          return c.error({
+          return refuseWithGuidanceInMessage({
             code: "kit.cli.INVALID_BODY",
             message,
             retryable: true,
@@ -425,7 +429,7 @@ function makeLeafHandler(ops: ReadonlyArray<OperationDescriptor>) {
         }
 
         const result = await runCommand(
-          c,
+          { error: refuseWithGuidanceInMessage },
           invokeOperation(
             descriptor,
             client,
@@ -464,7 +468,7 @@ function makeLeafHandler(ops: ReadonlyArray<OperationDescriptor>) {
             yield streamEvent;
           }
           try {
-            for await (const chunk of result.stream) {
+            for await (const chunk of result) {
               yield chunk;
             }
           } catch (streamError) {
@@ -481,7 +485,7 @@ function makeLeafHandler(ops: ReadonlyArray<OperationDescriptor>) {
             if (failed !== undefined) {
               yield failed;
             }
-            return c.error({
+            return refuseWithGuidanceInMessage({
               ...rendered,
               exitCode: 1,
             });
@@ -518,7 +522,7 @@ function makeLeafHandler(ops: ReadonlyArray<OperationDescriptor>) {
         if (failed !== undefined) {
           yield failed;
         }
-        return c.error({
+        return refuseWithGuidanceInMessage({
           ...rendered,
           exitCode: 1,
         });