poe-code 4.0.8 → 4.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poe-code",
-  "version": "4.0.8",
+  "version": "4.0.9",
   "description": "CLI tool to configure Poe API for developer workflows.",
   "license": "MIT",
   "type": "module",
@@ -199,7 +199,6 @@
     "mustache": "^4.2.0",
     "openai": "^6.34.0",
     "parse-duration": "^2.1.5",
-    "poe-code": "^3.0.410",
     "semver": "^7.7.4",
     "shell-quote": "^1.8.4",
     "simple-git": "^3.36.0",

package/packages/toolcraft-openapi/dist/generate.d.ts

@@ -118,6 +118,7 @@ export interface GeneratedSkill {
 export interface GeneratedCommand {
     noun: string;
     verb: string;
+    topLevel: boolean;
     exportName: string;
     filePath: string;
     operationId: string;

package/packages/toolcraft-openapi/dist/generate.js

@@ -154,6 +154,7 @@ function applyConfiguredCommandShape(commands, config) {
         }
         command.noun = createSafeGeneratedNoun(match.noun);
         command.verb = createSafeGeneratedVerb(match.verb);
+        command.topLevel = false;
         command.examples = config?.readme?.examples?.[match.exampleKey];
         applyConfiguredRawResponse(command);
         applyConfiguredIdempotency(command, match.method, config);
@@ -223,8 +224,12 @@ function createSafeGeneratedVerb(value) {
     return verb;
 }
 function refreshGeneratedCommandNames(command) {
-    command.exportName = `${toCamelCase(command.noun)}${toPascalCase(command.verb)}Command`;
-    command.filePath = `${command.noun}/${command.verb}.ts`;
+    command.exportName = command.topLevel
+        ? `${toCamelCase(command.verb)}Command`
+        : `${toCamelCase(command.noun)}${toPascalCase(command.verb)}Command`;
+    command.filePath = command.topLevel
+        ? `${command.verb}.ts`
+        : `${command.noun}/${command.verb}.ts`;
 }
 export function collectGeneratedCommand(document, path, method) {
     const normalizedDocument = normalizeOpenApiDocument(document);
@@ -264,15 +269,24 @@ function createGeneratedCommand(document, entry) {
     const auth = getOperationAuthMode(document, operation, operationId);
     const response = resolveSuccessResponse(document, operation, operationId);
     const noun = createSafeGeneratedNoun(deriveNoun(operation, entry.path, operationId));
-    const verb = deriveVerb(entry.method, entry.path, operation, operationId, noun);
+    const derivedVerb = deriveVerb(entry.method, entry.path, operation, operationId, noun);
     const collected = collectParams(document, entry, operation, operationId, auth, response.mode);
     const positional = collectPathPositionals(entry.path, collected.params, operationId);
+    const topLevel = entry.method === "get" &&
+        operation.tags?.some((tag) => tag.length > 0) !== true &&
+        positional.length === 0 &&
+        derivedVerb === METHOD_DEFAULTS.get?.collection &&
+        normalizeNoun(operationId) === noun;
+    const verb = topLevel ? noun : derivedVerb;
     const methodDefaults = METHOD_DEFAULTS[entry.method];
-    const exportName = `${toCamelCase(noun)}${toPascalCase(verb)}Command`;
-    const filePath = `${noun}/${verb}.ts`;
+    const exportName = topLevel
+        ? `${toCamelCase(verb)}Command`
+        : `${toCamelCase(noun)}${toPascalCase(verb)}Command`;
+    const filePath = topLevel ? `${verb}.ts` : `${noun}/${verb}.ts`;
     return {
         noun,
         verb,
+        topLevel,
         exportName,
         filePath,
         operationId,
@@ -1859,19 +1873,20 @@ function collectTagDescriptions(document) {
 }
 function createIndexFile(commands, document) {
     const groups = groupByNoun(commands);
+    const topLevelCommands = commands.filter((command) => command.topLevel);
     const tagDescriptions = collectTagDescriptions(document);
-    if (groups.length === 0) {
+    if (commands.length === 0) {
         return {
             path: "index.ts",
             contents: createGeneratedTypeScriptFile(["export const generatedCommands = [] as const;", ""])
         };
     }
     const lines = createGeneratedTypeScriptFileLines();
-    lines.push('import { defineGroup } from "toolcraft";');
-    for (const { commands: nounCommands } of groups) {
-        for (const command of nounCommands) {
-            lines.push(`import { ${command.exportName} } from ${JSON.stringify(`./${command.filePath.replace(/\.ts$/, ".js")}`)};`);
-        }
+    if (groups.length > 0) {
+        lines.push('import { defineGroup } from "toolcraft";');
+    }
+    for (const command of [...topLevelCommands, ...groups.flatMap(({ commands }) => commands)]) {
+        lines.push(`import { ${command.exportName} } from ${JSON.stringify(`./${command.filePath.replace(/\.ts$/, ".js")}`)};`);
     }
     if (lines.length > 1) {
         lines.push("");
@@ -1887,7 +1902,10 @@ function createIndexFile(commands, document) {
         lines.push("});");
         lines.push("");
     }
-    lines.push(`export const generatedCommands = [${groups.map(({ noun }) => toCamelCase(noun)).join(", ")}] as const;`);
+    lines.push(`export const generatedCommands = [${[
+        ...topLevelCommands.map((command) => command.exportName),
+        ...groups.map(({ noun }) => toCamelCase(noun))
+    ].join(", ")}] as const;`);
     lines.push("");
     return {
         path: "index.ts",
@@ -2075,8 +2093,7 @@ function renderSkillCommandCatalogLine(commandName, command) {
 function renderSkillCommandLine(commandName, command) {
     const parts = [
         commandName,
-        command.noun,
-        command.verb,
+        ...(command.topLevel ? [command.verb] : [command.noun, command.verb]),
         ...command.positional.map((paramName) => `<${paramName}>`)
     ];
     const requiredFlags = command.params.filter((param) => !param.optional &&

package/packages/toolcraft-openapi/dist/group-by-noun.js

@@ -1,6 +1,9 @@
 export function groupByNoun(commands) {
     const groups = new Map();
     for (const command of commands) {
+        if (command.topLevel) {
+            continue;
+        }
         const current = groups.get(command.noun);
         if (current === undefined) {
             groups.set(command.noun, [command]);

package/packages/toolcraft-openapi/dist/inspect.js

@@ -68,7 +68,7 @@ function createSupportedOperation(metadata, command) {
     return {
         ...metadata,
         status: "supported",
-        commandPath: `${command.noun} ${command.verb}`
+        commandPath: command.topLevel ? command.verb : `${command.noun} ${command.verb}`
     };
 }
 function readOperationMetadata(path, method, operation) {