@promptbook/cli 0.114.0-33 → 0.114.0-34

package/src/cli/promptbookCli.ts

@@ -22,6 +22,7 @@ import { $initializeStartPipelinesServerCommand } from './cli-commands/start-pip
 import { $initializeTestCommand } from './cli-commands/test-command';
 import { $addGlobalOptionsToCommand } from './common/$addGlobalOptionsToCommand';
 import { $deprecateCliCommand } from './common/$deprecateCliCommand';
+import { $reportMissingCliSubcommand } from './common/$requireCliSubcommand';
 
 /**
  * Shared deprecation text for top-level CLI commands backed by the old pipeline system.
@@ -97,10 +98,17 @@ export async function promptbookCli(): Promise<void> {
 
     // Note: These options are valid for all commands
 
+    // Note: Commands are listed in the help in the order they are registered,
+    //       `coder` is the most used one so it goes first and the deprecated ones,
+    //       which `$deprecateTopLevelCommands` hides from the help entirely, go last
+    $initializeCoderCommand(program);
+    $initializeAgentCommand(program);
+    $initializeAgentFolderCommand(program);
+    $initializeAgentsServerCommand(program);
     $initializeAboutCommand(program);
+    $initializeHelloCommand(program);
     $initializeRunCommand(program);
     $initializeLoginCommand(program);
-    $initializeHelloCommand(program);
     $initializeMakeCommand(program);
     $initializePrettifyCommand(program);
     $initializeTestCommand(program);
@@ -108,19 +116,16 @@ export async function promptbookCli(): Promise<void> {
     $initializeListScrapersCommand(program);
     $initializeStartAgentsServerCommand(program);
     $initializeStartPipelinesServerCommand(program);
-    $initializeAgentCommand(program);
-    $initializeAgentFolderCommand(program);
-    $initializeAgentsServerCommand(program);
-    $initializeCoderCommand(program);
 
     $deprecateTopLevelCommands(program);
 
     // TODO: [🧠] Should it be here or not> $addGlobalOptionsToCommand(program);
     program.commands.forEach($addGlobalOptionsToCommand);
 
+    // Note: There is no default command, so `ptbk` without a subcommand asks for one
+    //       instead of running the deprecated `ptbk run`
     if (commandLineArguments.length === 0) {
-        program.outputHelp();
-        return process.exit(0);
+        return $reportMissingCliSubcommand(program);
     }
 
     program.parse(process.argv);
@@ -138,7 +143,7 @@ function isTopLevelVersionRequested(commandLineArguments: ReadonlyArray<string>)
 }
 
 /**
- * Adds one deprecation notice to each configured top-level legacy command.
+ * Marks each configured top-level legacy command as deprecated, which keeps it usable but takes it out of the help.
  */
 function $deprecateTopLevelCommands(program: commander.Command): void {
     for (const command of program.commands) {
@@ -151,7 +156,6 @@ function $deprecateTopLevelCommands(program: commander.Command): void {
 }
 
 // Note: [🟡] Code for CLI program [promptbookCli](src/cli/promptbookCli.ts) should never be published outside of `@promptbook/cli`
-// TODO: [🧠] Maybe `run` command the default, instead of `ptbk run ./foo.book` -> `ptbk ./foo.book`
 // TODO: [🥠] Do not export, its just for CLI script
 // TODO: [🕌] When more functionalities, rename
 // Note: 11:11

package/src/llm-providers/vercel/VercelExecutionToolsOptions.ts

@@ -24,7 +24,12 @@ export type VercelExecutionToolsOptions = CommonToolsOptions &
         //       and not to pass it as a separate parameter
 
         /**
-         * Additional settings for chat models when calling `vercelProvider.chat('model-name', settings)`
+         * Additional settings for chat models, for example `temperature` or `providerOptions`
+         *
+         * Note: Since Vercel AI SDK v5 these settings belong to the model call, not to
+         *       `vercelProvider.chat('model-name')` which takes just the model name
          */
-        readonly additionalChatSettings?: Partial<Parameters<VercelProvider['chat']>[1]>;
+        readonly additionalChatSettings?: Partial<
+            Omit<Parameters<ReturnType<VercelProvider['chat']>['doGenerate']>[0], 'prompt'>
+        >;
     };

package/src/llm-providers/vercel/createExecutionToolsFromVercelProvider.ts

@@ -34,7 +34,9 @@ const VERCEL_PROVIDER_PROFILE: ChatParticipant = {
  */
 export function createExecutionToolsFromVercelProvider(options: VercelExecutionToolsOptions): LlmExecutionTools {
     let { title, description } = options;
-    const { vercelProvider, availableModels, userId, additionalChatSettings = {} } = options;
+    const { vercelProvider, availableModels, additionalChatSettings = {} } = options;
+    // <- Note: `userId` is not forwarded, because Vercel AI SDK moved provider-specific settings like `user` from
+    //          `vercelProvider.chat(modelName, settings)` into `providerOptions` which are keyed by the provider
 
     if (!/Vercel/i.test(title)) {
         title = `${title} (through Vercel)`;
@@ -89,10 +91,7 @@ export function createExecutionToolsFromVercelProvider(options: VercelExecutionT
                 );
             }
 
-            const model = await vercelProvider.chat(modelName, {
-                user: userId?.toString() || undefined,
-                ...additionalChatSettings,
-            });
+            const model = await vercelProvider.chat(modelName);
 
             const rawPromptContent = templateParameters(content, { ...parameters, modelName });
 
@@ -132,14 +131,9 @@ export function createExecutionToolsFromVercelProvider(options: VercelExecutionT
 
             const rawRequest: Parameters<typeof model.doGenerate>[0] = {
                 // <- TODO: [☂]
-                inputFormat: 'messages',
-                mode: {
-                    type: 'regular',
-                    tools: [
-                        /* <- TODO: Pass the tools */
-                    ],
-                },
                 prompt: promptMessages,
+                // <- TODO: Pass the tools via `tools`
+                ...additionalChatSettings,
             };
 
             const start: string_date_iso8601 = $getCurrentDate();
@@ -161,10 +155,17 @@ export function createExecutionToolsFromVercelProvider(options: VercelExecutionT
                 console.info(colors.bgWhite('rawResponse'), JSON.stringify(rawResponse, null, 4));
             }
 
-            if (rawResponse.text === undefined) {
+            // Note: Vercel AI SDK returns ordered content parts, the chat message is made only of the text parts
+            const responseTextParts = rawResponse.content.flatMap((contentPart) =>
+                contentPart.type === 'text' ? [contentPart.text] : [],
+            );
+
+            if (responseTextParts.length === 0) {
                 throw new PipelineExecutionError('No response message');
             }
 
+            const responseText = responseTextParts.join('');
+
             const complete: string_date_iso8601 = $getCurrentDate();
 
             const duration = uncertainNumber((new Date(complete).getTime() - new Date(start).getTime()) / 1000);
@@ -173,15 +174,15 @@ export function createExecutionToolsFromVercelProvider(options: VercelExecutionT
                 price: UNCERTAIN_ZERO_VALUE, //  <- TODO: [🕘] Price count
                 duration,
                 input: {
-                    tokensCount: uncertainNumber(rawResponse.usage.promptTokens),
+                    tokensCount: uncertainNumber(rawResponse.usage.inputTokens),
                     ...computeUsageCounts(
                         rawPromptContent,
                         // <- TODO: [🕘][🙀] What about system message
                     ),
                 },
                 output: {
-                    tokensCount: uncertainNumber(rawResponse.usage.completionTokens),
-                    ...computeUsageCounts(rawResponse.text),
+                    tokensCount: uncertainNumber(rawResponse.usage.outputTokens),
+                    ...computeUsageCounts(responseText),
                 },
             };
 
@@ -189,7 +190,7 @@ export function createExecutionToolsFromVercelProvider(options: VercelExecutionT
                 name: 'promptResult',
                 message: `Result of \`createExecutionToolsFromVercelProvider.callChatModel\``,
                 value: {
-                    content: rawResponse.text,
+                    content: responseText,
                     modelName,
                     timing: {
                         start,