@vwork/cli 0.1.2 → 0.1.4

package/dist/codegen.js

@@ -36,16 +36,32 @@ export async function runCodegenCommand(command, client, config) {
         const bindingNames = arrayFlag(command.flags.binding);
         const sourceCode = stringFlag(command.flags["source-code"]);
         const draftInvoke = draftInvokeInput(command);
-        return {
-            value: await client.request("POST", `${appPath}/functions/${encodeURIComponent(functionName)}/codegen`, {
-                prompt,
-                auth_required: command.flags["no-auth"] === true ? false : true,
-                ...(bindingNames.length > 0 ? { binding_names: bindingNames } : {}),
-                ...(sourceCode ? { source_code: sourceCode } : {}),
-                ...(command.flags.repair === true ? { repair: { enabled: true, max_attempts: 2 } } : {}),
-                ...(draftInvoke ? { draft_invoke: draftInvoke } : {})
-            })
+        const session = await client.request("POST", `${appPath}/codegen-sessions`, {
+            target: `workerd_function:${functionName}`,
+            title: `${functionName} codegen`,
+            description: prompt
+        });
+        const requestBody = {
+            session_id: String(session.id),
+            prompt,
+            auth_required: command.flags["no-auth"] === true ? false : true,
+            ...(bindingNames.length > 0 ? { binding_names: bindingNames } : {}),
+            ...(sourceCode ? { source_code: sourceCode } : {}),
+            ...(command.flags.repair === true ? { repair: { enabled: true, max_attempts: 2 } } : {}),
+            ...(draftInvoke ? { draft_invoke: draftInvoke } : {})
         };
+        try {
+            return {
+                value: await client.request("POST", `${appPath}/functions/${encodeURIComponent(functionName)}/codegen`, requestBody)
+            };
+        }
+        catch (error) {
+            if (!isGatewayTimeout(error))
+                throw error;
+            return {
+                value: await waitForCodegenSessionRun(client, appPath, String(session.id))
+            };
+        }
     }
     if (group === "runs" && action === "list") {
         const body = await client.request("GET", `${appPath}/code-generations`);
@@ -100,7 +116,8 @@ function draftInvokeInput(command) {
     return {
         enabled: true,
         ...(body ? { body } : {}),
-        ...(bindings ? { bindings } : {})
+        ...(bindings ? { bindings } : {}),
+        response_contract: "vwork_function_output_v1"
     };
 }
 function optionalJsonObjectFlag(command, key) {
@@ -113,6 +130,24 @@ function optionalJsonObjectFlag(command, key) {
     }
     return parsed;
 }
+async function waitForCodegenSessionRun(client, appPath, sessionId) {
+    const deadline = Date.now() + 180_000;
+    let lastRuns = [];
+    do {
+        const body = await client.request("GET", `${appPath}/codegen-sessions/${encodeURIComponent(sessionId)}/runs`);
+        lastRuns = body.code_generations;
+        if (lastRuns.length > 0)
+            return lastRuns[0];
+        await sleep(3_000);
+    } while (Date.now() < deadline);
+    throw new Error(`Timed out waiting for codegen run in session ${sessionId}`);
+}
+function isGatewayTimeout(error) {
+    return Boolean(error && typeof error === "object" && "status" in error && error.status === 524);
+}
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
 function mcpConfigSnippet(command, config) {
     const workspace = stringFlag(command.flags.workspace) ?? process.cwd();
     const appId = stringFlag(command.flags.app) ?? config.appId;

package/dist/functions.js

@@ -108,7 +108,7 @@ async function runFunctionRouteCommand(command, client, appPath) {
     const basePath = `${appPath}/function-routes`;
     if (action === "list") {
         const body = await client.request("GET", basePath);
-        return { rows: body.routes };
+        return { rows: body.function_routes ?? body.routes ?? [] };
     }
     if (action === "add" || action === "create") {
         const functionName = stringFlag(command.flags.function) ?? requiredPosition(command, 0, "function name");

package/dist/index.js

@@ -1,4 +1,6 @@
 #!/usr/bin/env node
+import { realpathSync } from "node:fs";
+import { resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { runOclifCli } from "./oclif-command.js";
 export async function runCli(argv, env, cwd) {
@@ -8,10 +10,21 @@ export async function runCli(argv, env, cwd) {
 export function isDirectCliEntrypoint(moduleUrl, argvPath) {
     if (!argvPath)
         return false;
-    return normalizePath(fileURLToPath(moduleUrl)) === normalizePath(argvPath);
+    const argvPaths = new Set(candidatePaths(argvPath));
+    return candidatePaths(fileURLToPath(moduleUrl)).some((candidate) => argvPaths.has(candidate));
 }
 function normalizePath(value) {
-    return value.replace(/\\/g, "/");
+    return resolve(value).replace(/\\/g, "/").toLowerCase();
+}
+function candidatePaths(value) {
+    const paths = new Set([normalizePath(value)]);
+    try {
+        paths.add(normalizePath(realpathSync.native(value)));
+    }
+    catch {
+        // Keep the direct normalized path when realpath cannot resolve.
+    }
+    return [...paths];
 }
 function withRuntime(env, cwd, run) {
     const originalEnv = process.env;

package/dist/observability.js

@@ -4,7 +4,7 @@ export async function runObservabilityCommand(command, client) {
     if (action === "access-logs") {
         const query = new URLSearchParams();
         const source = stringFlag(command.flags.source);
-        const app = stringFlag(command.flags.app);
+        const app = await resolveAppId(client, stringFlag(command.flags.app));
         const limit = stringFlag(command.flags.limit);
         if (source)
             query.set("source", source);
@@ -18,3 +18,9 @@ export async function runObservabilityCommand(command, client) {
     }
     throw new Error(`Unknown observability command: ${action ?? ""}`);
 }
+async function resolveAppId(client, target) {
+    if (!target)
+        return undefined;
+    const app = await client.request("GET", `/apps/lookup/${encodeURIComponent(target)}`);
+    return String(app.id);
+}

package/dist/oclif-command.js

@@ -228,6 +228,8 @@ function maxPathLength(path) {
         return 3;
     if (path[0] === "functions" && path[1] === "previews")
         return 3;
+    if (path[0] === "functions" && path[1] === "routes")
+        return 3;
     if (path[0] === "functions" && path[1] === "queue-bindings")
         return 3;
     return 2;

package/package.json

@@ -1,31 +1,31 @@
-{
-  "name": "@vwork/cli",
-  "version": "0.1.2",
-  "type": "module",
-  "files": [
-    "dist/*.js",
-    "dist/auth/*.js",
-    "package.json"
-  ],
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "bin": {
-    "vwork": "dist/index.js"
-  },
-  "dependencies": {
-    "@oclif/core": "^4.11.7",
+{
+  "name": "@vwork/cli",
+  "version": "0.1.4",
+  "type": "module",
+  "files": [
+    "dist/*.js",
+    "dist/auth/*.js",
+    "package.json"
+  ],
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
+  "bin": {
+    "vwork": "dist/index.js"
+  },
+  "scripts": {
+    "dev": "tsx src/index.ts",
+    "build": "tsc -p tsconfig.json",
+    "test": "pnpm --filter @vwork/platform-client build && tsx --test src/test/*.test.ts",
+    "typecheck": "pnpm --filter @vwork/platform-client build && tsc -p tsconfig.json --noEmit"
+  },
+  "dependencies": {
+    "@oclif/core": "^4.11.7",
     "@vwork/platform-client": "^0.1.0"
-  },
-  "devDependencies": {
-    "@types/node": "^22.10.2",
-    "tsx": "^4.19.2",
-    "typescript": "^5.7.2"
-  },
-  "scripts": {
-    "dev": "tsx src/index.ts",
-    "build": "tsc -p tsconfig.json",
-    "test": "pnpm --filter @vwork/platform-client build && tsx --test src/test/*.test.ts",
-    "typecheck": "pnpm --filter @vwork/platform-client build && tsc -p tsconfig.json --noEmit"
-  }
-}
+  },
+  "devDependencies": {
+    "@types/node": "^22.10.2",
+    "tsx": "^4.19.2",
+    "typescript": "^5.7.2"
+  }
+}