@ductape/cli 0.3.2 → 0.3.4

package/dist/commands/products.js

@@ -5,7 +5,7 @@ import { bodyRequiredHint, resolveBody } from '../lib/read-body.js';
 import { createProduct, deleteProduct, getProduct, listProductApps, listProducts, updateProduct, } from '../lib/platform-api.js';
 import { printJson } from '../lib/output.js';
 import { requireWorkspaceContext } from '../lib/workspace-context.js';
-import { requireSession, getSdkProxy } from '../lib/proxy/context.js';
+import { getSdkProxyForContext, getOptionalProject } from '../lib/proxy/context.js';
 const VERBS = ['list', 'get', 'create', 'update', 'delete'];
 export async function runProducts(verb, opts, extraArgs) {
     const v = verb.toLowerCase();
@@ -158,15 +158,34 @@ export async function runProductComponents(verb, opts) {
         components,
     }, Boolean(opts.json));
 }
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+/**
+ * environments.fetch immediately after a create/update can race a replication/read-after-write
+ * lag and come back empty even though the write succeeded. Retry a few times before treating it
+ * as a real failure.
+ */
+async function fetchEnvironmentWithRetry(proxy, productTag, slug, attempts = 3, delayMs = 400) {
+    for (let attempt = 1; attempt <= attempts; attempt += 1) {
+        const found = await proxy.execute('product', 'environments.fetch', [productTag, slug]);
+        if (found)
+            return found;
+        if (attempt < attempts)
+            await sleep(delayMs);
+    }
+    return null;
+}
 export async function runProductEnvironments(verb, opts, extraArgs) {
     const v = verb.toLowerCase();
     const allowed = ['list', 'get', 'fetch', 'create', 'update'];
     if (!allowed.includes(v)) {
         throw new Error(`Unknown environments verb "${verb}". Use: ${allowed.join(', ')}`);
     }
-    const session = requireSession();
-    const proxy = getSdkProxy(session);
-    const productTag = opts.product ?? extraArgs[0] ?? session.project?.product_tag;
+    // No linked project required: the product tag always comes from an explicit argument here.
+    // Only fall back to a linked project's product_tag (without requiring one to exist) when the
+    // caller supplied neither --product nor a positional tag.
+    const ctx = requireWorkspaceContext();
+    const proxy = getSdkProxyForContext(ctx);
+    const productTag = opts.product ?? extraArgs[0] ?? getOptionalProject()?.product_tag;
     if (!productTag)
         throw new Error('Provide the product tag as the first argument or --product <tag>');
     if (v === 'list') {
@@ -190,7 +209,7 @@ export async function runProductEnvironments(verb, opts, extraArgs) {
                 return;
             }
             await proxy.execute('product', 'environments.create', [productTag, body]);
-            const verified = await proxy.execute('product', 'environments.fetch', [productTag, body.slug]);
+            const verified = await fetchEnvironmentWithRetry(proxy, productTag, body.slug);
             if (!verified)
                 throw new Error(`Environment "${body.slug}" was not found after creation.`);
             printJson({ product: productTag, slug: body.slug, created: true, environment: verified }, Boolean(opts.json));
@@ -200,7 +219,7 @@ export async function runProductEnvironments(verb, opts, extraArgs) {
         if (!updateSlug)
             throw new Error('Environment update requires --slug <slug>.');
         await proxy.execute('product', 'environments.update', [productTag, updateSlug, body]);
-        const verified = await proxy.execute('product', 'environments.fetch', [productTag, body.slug ?? updateSlug]);
+        const verified = await fetchEnvironmentWithRetry(proxy, productTag, body.slug ?? updateSlug);
         if (!verified)
             throw new Error(`Environment "${updateSlug}" was not found after update.`);
         printJson({ product: productTag, slug: body.slug ?? updateSlug, updated: true, environment: verified }, Boolean(opts.json));

package/dist/index.js

@@ -541,17 +541,21 @@ const productComponents = products
     .description('Compact, non-secret product component inventory');
 productComponents
     .command('list')
-    .requiredOption('-t, --tag <tag>', 'Product tag')
+    // NOTE: cannot use -t/--tag here — it collides with the parent `products` command's own
+    // -t/--tag option (used by `products get`/`products update`). Same Commander ancestor/
+    // descendant flag-collision issue documented on `environments create`/`update` above.
+    .requiredOption('--product-tag <tag>', 'Product tag')
     .option('--profile <name>')
     .option('--json', 'JSON output')
-    .action(wrap((opts) => runProductComponents('list', opts)));
+    .action(wrap((opts) => runProductComponents('list', { ...opts, tag: opts.productTag })));
 productComponents
     .command('get')
-    .requiredOption('-t, --tag <tag>', 'Product tag')
+    // See NOTE above on `list` — same -t/--tag collision with the parent `products` command.
+    .requiredOption('--product-tag <tag>', 'Product tag')
     .requiredOption('--type <type>', 'Component type, e.g. notifications or events')
     .option('--profile <name>')
     .option('--json', 'JSON output')
-    .action(wrap((opts) => runProductComponents('get', opts)));
+    .action(wrap((opts) => runProductComponents('get', { ...opts, tag: opts.productTag })));
 const productEnvironments = products
     .command('environments')
     .description('Product environments (list, get, idempotent create, update)');
@@ -564,15 +568,20 @@ productEnvironments
 productEnvironments
     .command('create <product_tag>')
     .description('Idempotently create a product environment and verify persistence')
-    .requiredOption('-f, --file <path>', 'Environment JSON: env_name, description, slug, active?')
+    // NOTE: cannot use -f/--file here — it collides with the parent `products` command's own
+    // -f/--file option (used by `products create`/`products update`). Commander resolves a flag
+    // shared by an ancestor and a descendant command against the ancestor, so the value never
+    // reaches this subcommand's own opts, and requiredOption fails even when -f is supplied.
+    .requiredOption('--env-file <path>', 'Environment JSON: env_name, description, slug, active?')
     .option('--json', 'JSON output')
-    .action(wrap((productTag, opts) => runProductEnvironments('create', { product: productTag, file: opts.file, json: opts.json }, [])));
+    .action(wrap((productTag, opts) => runProductEnvironments('create', { product: productTag, file: opts.envFile, json: opts.json }, [])));
 productEnvironments
     .command('update <product_tag> <slug>')
     .description('Update a product environment and verify persistence')
-    .requiredOption('-f, --file <path>', 'Environment patch JSON')
+    // See NOTE above on `create` — same -f/--file collision with the parent `products` command.
+    .requiredOption('--env-file <path>', 'Environment patch JSON')
     .option('--json', 'JSON output')
-    .action(wrap((productTag, slug, opts) => runProductEnvironments('update', { product: productTag, slug, file: opts.file, json: opts.json }, [])));
+    .action(wrap((productTag, slug, opts) => runProductEnvironments('update', { product: productTag, slug, file: opts.envFile, json: opts.json }, [])));
 productEnvironments
     .command('get <product_tag> [slug]')
     .description('Fetch a single product environment by slug')

package/dist/lib/proxy/context.d.ts

@@ -9,6 +9,18 @@ export interface SessionContext {
 }
 export declare function requireCredentials(): Credentials;
 export declare function requireSession(): SessionContext;
+/**
+ * Builds an SDK proxy from just apiUrl + workspaceId + credentials — no linked project
+ * required. Use this (via requireWorkspaceContext()) for any command that already has an
+ * explicit product tag from its arguments and doesn't otherwise need project-scoped runtime
+ * context (env_slug, database/graph runtime state). Commands that need those still require a
+ * full linked project via requireSession()/getSdkProxy().
+ */
+export declare function getSdkProxyForContext(ctx: {
+    apiUrl: string;
+    workspaceId: string;
+    credentials: Credentials;
+}): SdkProxyClient;
 export declare function getSdkProxy(session?: SessionContext): SdkProxyClient;
 export declare function getDbProxy(session?: SessionContext): DbProxyClient;
 export declare function getDbContext(session?: SessionContext): import("../context-store.js").DatabaseContext;

package/dist/lib/proxy/context.js

@@ -17,14 +17,28 @@ export function requireSession() {
     const apiUrl = getApiUrl(profile);
     return { credentials, project, apiUrl };
 }
+/**
+ * Builds an SDK proxy from just apiUrl + workspaceId + credentials — no linked project
+ * required. Use this (via requireWorkspaceContext()) for any command that already has an
+ * explicit product tag from its arguments and doesn't otherwise need project-scoped runtime
+ * context (env_slug, database/graph runtime state). Commands that need those still require a
+ * full linked project via requireSession()/getSdkProxy().
+ */
+export function getSdkProxyForContext(ctx) {
+    return createSdkProxyClient({
+        apiUrl: ctx.apiUrl,
+        workspaceId: ctx.workspaceId,
+        userId: ctx.credentials.user_id,
+        publicKey: ctx.credentials.public_key,
+        token: ctx.credentials.auth_token,
+    });
+}
 export function getSdkProxy(session) {
     const s = session ?? requireSession();
-    return createSdkProxyClient({
+    return getSdkProxyForContext({
         apiUrl: s.apiUrl,
         workspaceId: s.project.workspace_id,
-        userId: s.credentials.user_id,
-        publicKey: s.credentials.public_key,
-        token: s.credentials.auth_token,
+        credentials: s.credentials,
     });
 }
 export function getDbProxy(session) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ductape/cli",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Ductape CLI — local platform, login, link projects, and manage resources via the proxy (Workbench-compatible)",
   "type": "module",
   "main": "dist/index.js",