@promptbook/cli 0.114.0-35 → 0.114.0-39

package/src/cli/cli-commands/common/resolveLocalAgentSource.ts

@@ -0,0 +1,127 @@
+import { dirname } from 'path';
+import { spaceTrim } from 'spacetrim';
+import type { AgentReferenceResolver } from '../../../book-2.0/agent-source/AgentReferenceResolver';
+import { getEffectiveExplicitFromCommitment } from '../../../book-2.0/agent-source/explicitFromCommitment';
+import { parseAgentSourceWithCommitments } from '../../../book-2.0/agent-source/parseAgentSourceWithCommitments';
+import { parseAgentSource } from '../../../book-2.0/agent-source/parseAgentSource';
+import { isPseudoAgentUrl } from '../../../book-2.0/agent-source/pseudoAgentReferences';
+import { resolveInheritedAgentSource } from '../../../book-2.0/agent-source/resolveInheritedAgentSource';
+import type { string_book } from '../../../book-2.0/agent-source/string_book';
+import { DEFAULT_MAX_RECURSION } from '../../../config';
+import { ParseError } from '../../../errors/ParseError';
+import { createLocalAgentReferenceResolver } from './createLocalAgentReferenceResolver';
+import { LocalAgentBookCollection, type LocalAgentBook } from './LocalAgentBookCollection';
+
+/**
+ * Resolved source together with the profile resolver used when compiling TEAM commitments.
+ *
+ * @private internal type of CLI agent resolution
+ */
+export type ResolvedLocalAgentSource = {
+    readonly agentSource: string_book;
+    readonly agentReferenceResolver: AgentReferenceResolver;
+    /** Newly created books which the coder may include in its initialization commit. */
+    readonly createdAgentBookPaths: ReadonlyArray<string>;
+};
+
+/**
+ * Applies the shared Agent Server inheritance rules to a repository's local and remote books.
+ *
+ * @private internal utility of CLI agent resolution
+ */
+export async function resolveLocalAgentSource(
+    agentBookPath: string,
+    currentWorkingDirectory: string,
+): Promise<ResolvedLocalAgentSource> {
+    const collection = new LocalAgentBookCollection(dirname(agentBookPath), currentWorkingDirectory);
+    await collection.initialize();
+    const primaryBook = await collection.readBook(agentBookPath);
+    const adamAgentUrl = collection.getAdamAgentUrl();
+
+    /** Resolves each dependency with its own location and the current inheritance stack. */
+    async function resolveBook(
+        book: LocalAgentBook,
+        inheritancePath: ReadonlyArray<string> = [],
+    ): Promise<string_book> {
+        if (inheritancePath.length > DEFAULT_MAX_RECURSION) {
+            throw new ParseError(
+                spaceTrim(
+                    `Agent inheritance exceeds **${DEFAULT_MAX_RECURSION}** levels at \`${
+                        book.filePath || book.url
+                    }\`.`,
+                ),
+            );
+        }
+        const agentReferenceResolver = createLocalAgentReferenceResolver(collection, book);
+        const source = await resolveBookCommitmentReferences(book.source, agentReferenceResolver);
+        return resolveInheritedAgentSource(source, {
+            adamAgentUrl,
+            currentAgentUrl: book.url,
+            inheritancePath,
+            agentSourceImporter: async (url, context) =>
+                resolveBook(await collection.getBook(url), context.importAgentOptions.inheritancePath),
+        });
+    }
+
+    return {
+        agentSource: await resolveBook(primaryBook),
+        agentReferenceResolver: {
+            ...createLocalAgentReferenceResolver(collection, primaryBook),
+            resolveTeammateProfile: async (url) => {
+                if (isPseudoAgentUrl(url)) {
+                    return null;
+                }
+                const book = await collection.getBook(url);
+                const parsedSource = parseAgentSource(await resolveBook(book));
+                return {
+                    agentName: book.profile.agentName,
+                    personaDescription: parsedSource.personaDescription,
+                };
+            },
+        },
+        createdAgentBookPaths: collection.createdAgentBookPaths,
+    };
+}
+
+/**
+ * Resolves reference blocks before embedding dependencies so inherited TEAM paths keep their original directory.
+ * Parser-provided locations keep examples, unknown commitments and ordinary prose untouched.
+ */
+async function resolveBookCommitmentReferences(
+    source: string_book,
+    resolver: AgentReferenceResolver,
+): Promise<string_book> {
+    const parsedSource = parseAgentSourceWithCommitments(source);
+    const lines = source.split(/\r?\n/);
+    const commitmentStartLines = [...parsedSource.commitments, ...(parsedSource.unknownCommitments || [])]
+        .map((commitment) => commitment.lineNumber - 1)
+        .sort((left, right) => left - right);
+    const effectiveFrom = getEffectiveExplicitFromCommitment(source);
+
+    for (const commitment of [...parsedSource.commitments].reverse()) {
+        if (!['FROM', 'IMPORT', 'IMPORTS', 'TEAM'].includes(commitment.type)) {
+            continue;
+        }
+        const startLine = commitment.lineNumber - 1;
+        if (commitment.type === 'FROM' && effectiveFrom?.lineIndex !== startLine) {
+            continue;
+        }
+        let endLine = commitmentStartLines.find((lineNumber) => lineNumber > startLine) ?? lines.length;
+        // A horizontal rule also terminates a commitment before the next registered keyword.
+        for (let lineIndex = startLine + 1; lineIndex < endLine; lineIndex++) {
+            if (/^\s*(?:-{3,}|\*{3,}|_{3,})\s*$/.test(lines[lineIndex] || '')) {
+                endLine = lineIndex;
+                break;
+            }
+        }
+        const content = await resolver.resolveCommitmentContent(commitment.type, commitment.content);
+        const commitmentType = commitment.type === 'IMPORTS' ? 'IMPORT' : commitment.type;
+        const replacement = content.trim()
+            ? `${commitmentType} ${content}\n`
+            : commitmentType === 'FROM'
+            ? 'FROM @Null\n'
+            : '';
+        lines.splice(startLine, endLine - startLine, ...replacement.split('\n'));
+    }
+    return lines.join('\n') as string_book;
+}

package/src/cli/promptbookCli.ts

@@ -1,54 +1,12 @@
 import colors from 'colors';
 import commander from 'commander';
 import { spaceTrim } from 'spacetrim';
-import { CLAIM } from '../config';
 import { EnvironmentMismatchError } from '../errors/EnvironmentMismatchError';
 import { $isRunningInNode } from '../utils/environment/$isRunningInNode';
 import { PROMPTBOOK_ENGINE_VERSION } from '../version';
-import { $initializeAboutCommand } from './cli-commands/about';
-import { $initializeAgentCommand } from './cli-commands/agent';
-import { $initializeAgentFolderCommand } from './cli-commands/agent-folder';
-import { $initializeAgentsServerCommand } from './cli-commands/agents-server';
-import { $initializeCoderCommand } from './cli-commands/coder';
-import { $initializeHelloCommand } from './cli-commands/hello';
-import { $initializeListModelsCommand } from './cli-commands/list-models';
-import { $initializeListScrapersCommand } from './cli-commands/list-scrapers';
-import { $initializeLoginCommand } from './cli-commands/login';
-import { $initializeMakeCommand } from './cli-commands/make';
-import { $initializePrettifyCommand } from './cli-commands/prettify';
-import { $initializeRunCommand } from './cli-commands/run';
-import { $initializeStartAgentsServerCommand } from './cli-commands/start-agents-server';
-import { $initializeStartPipelinesServerCommand } from './cli-commands/start-pipelines-server';
-import { $initializeTestCommand } from './cli-commands/test-command';
-import { $addGlobalOptionsToCommand } from './common/$addGlobalOptionsToCommand';
-import { $deprecateCliCommand } from './common/$deprecateCliCommand';
+import { $initializePromptbookCliProgram } from './$initializePromptbookCliProgram';
 import { $reportMissingCliSubcommand } from './common/$requireCliSubcommand';
 
-/**
- * Shared deprecation text for top-level CLI commands backed by the old pipeline system.
- */
-const OLD_PIPELINE_SYSTEM_DEPRECATION_MESSAGE = 'This command is part of the old pipeline system.';
-
-/**
- * Shared deprecation text for top-level CLI commands backed by the old pre-agent system.
- */
-const OLD_SYSTEM_DEPRECATION_MESSAGE = 'This command is part of the old system.';
-
-/**
- * Deprecation guidance for top-level `ptbk` commands that remain for compatibility.
- */
-const DEPRECATED_TOP_LEVEL_COMMAND_MESSAGES: Readonly<Record<string, string>> = {
-    run: OLD_PIPELINE_SYSTEM_DEPRECATION_MESSAGE,
-    login: OLD_PIPELINE_SYSTEM_DEPRECATION_MESSAGE,
-    make: OLD_PIPELINE_SYSTEM_DEPRECATION_MESSAGE,
-    prettify: OLD_PIPELINE_SYSTEM_DEPRECATION_MESSAGE,
-    test: OLD_PIPELINE_SYSTEM_DEPRECATION_MESSAGE,
-    'list-models': OLD_SYSTEM_DEPRECATION_MESSAGE,
-    'list-scrapers': OLD_SYSTEM_DEPRECATION_MESSAGE,
-    'start-agents-server': 'Use `ptbk agents-server start` instead.',
-    'start-pipelines-server': OLD_PIPELINE_SYSTEM_DEPRECATION_MESSAGE,
-};
-
 /**
  * Raw top-level CLI arguments that print the Promptbook version.
  *
@@ -90,37 +48,7 @@ export async function promptbookCli(): Promise<void> {
     }
 
     const program = new commander.Command();
-    program.name('promptbook');
-    program.alias('ptbk');
-
-    program.version(PROMPTBOOK_ENGINE_VERSION);
-    program.description(CLAIM);
-
-    // 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);
-    $initializeMakeCommand(program);
-    $initializePrettifyCommand(program);
-    $initializeTestCommand(program);
-    $initializeListModelsCommand(program);
-    $initializeListScrapersCommand(program);
-    $initializeStartAgentsServerCommand(program);
-    $initializeStartPipelinesServerCommand(program);
-
-    $deprecateTopLevelCommands(program);
-
-    // TODO: [🧠] Should it be here or not> $addGlobalOptionsToCommand(program);
-    program.commands.forEach($addGlobalOptionsToCommand);
+    $initializePromptbookCliProgram(program);
 
     // Note: There is no default command, so `ptbk` without a subcommand asks for one
     //       instead of running the deprecated `ptbk run`
@@ -142,19 +70,6 @@ function isTopLevelVersionRequested(commandLineArguments: ReadonlyArray<string>)
     return firstCommandLineArgument !== undefined && VERSION_OPTION_ARGUMENTS.has(firstCommandLineArgument);
 }
 
-/**
- * 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) {
-        const deprecationMessage = DEPRECATED_TOP_LEVEL_COMMAND_MESSAGES[command.name()];
-
-        if (deprecationMessage !== undefined) {
-            $deprecateCliCommand(command, deprecationMessage);
-        }
-    }
-}
-
 // Note: [🟡] Code for CLI program [promptbookCli](src/cli/promptbookCli.ts) should never be published outside of `@promptbook/cli`
 // TODO: [🥠] Do not export, its just for CLI script
 // TODO: [🕌] When more functionalities, rename