@ductape/cli 0.3.8 → 0.3.9

package/CHANGELOG.md

@@ -20,7 +20,7 @@
 - `ductape workspaces current`, `workspaces switch`, `workspaces refresh`
 - `ductape login --workspace`, `--skip-workspace-select`
 - `ductape link` defaults to active workspace; `whoami` shows `active_workspace`
-- Switching workspaces updates linked `.ductape/config.json` when present
+- Switching workspaces updates linked `ductape/config.json` when present
 
 ## 0.2.0
 

package/dist/commands/link.js

@@ -57,5 +57,5 @@ export async function runLink(opts) {
     };
     saveProjectConfig(targetDir, config);
     setActiveWorkspace(workspaceIdValue, workspaceLabel(workspaceSummary), workspaceTagValue);
-    success(`Linked project in ${path.join(targetDir, '.ductape/config.json')}`);
+    success(`Linked project in ${path.join(targetDir, 'ductape/config.json')}`);
 }

package/dist/commands/resources.d.ts

@@ -1,4 +1,15 @@
 import { type CommandInteractiveFlags } from '../lib/interactive-opts.js';
+import type { SDKModule } from '../lib/proxy/sdk-proxy.js';
+export declare function resolveResourceProductTag(override: string | undefined, linkedProductTag: string): string;
+type ResourceProxy = {
+    execute<T>(module: SDKModule, method: string, params?: unknown[]): Promise<T>;
+};
+/**
+ * Session inventories on older platform versions can fail when the component does not exist.
+ * Confirm the state through the product catalogue before treating that failure as an empty list,
+ * so transport, authentication, and genuine server failures are never silently swallowed.
+ */
+export declare function listSessionsWithProductFallback(proxy: ResourceProxy, productTag: string): Promise<unknown[]>;
 export declare function runResourcesList(json: boolean): void;
 export declare function runEventTopicCrud(verb: string, opts: {
     tag?: string;
@@ -13,6 +24,8 @@ export declare function runNotificationMessageCrud(verb: string, opts: {
 }): Promise<void>;
 export declare function runResourceCrud(typeName: string, verb: string, opts: {
     tag?: string;
+    product?: string;
     file?: string;
     json?: boolean;
 } & CommandInteractiveFlags, extraArgs: string[]): Promise<void>;
+export {};

package/dist/commands/resources.js

@@ -6,6 +6,43 @@ import { bodyRequiredHint, resolveBody } from '../lib/read-body.js';
 import { requireSession, getSdkProxy } from '../lib/proxy/context.js';
 import { printJson } from '../lib/output.js';
 const CRUD_VERBS = ['create', 'list', 'get', 'update', 'delete', 'connect'];
+export function resolveResourceProductTag(override, linkedProductTag) {
+    return override?.trim() || linkedProductTag;
+}
+function unwrapArray(value) {
+    if (Array.isArray(value))
+        return value;
+    if (value && typeof value === 'object' && Array.isArray(value.data)) {
+        return value.data;
+    }
+    return undefined;
+}
+/**
+ * Session inventories on older platform versions can fail when the component does not exist.
+ * Confirm the state through the product catalogue before treating that failure as an empty list,
+ * so transport, authentication, and genuine server failures are never silently swallowed.
+ */
+export async function listSessionsWithProductFallback(proxy, productTag) {
+    try {
+        const result = await proxy.execute('sessions', 'list', [productTag]);
+        return unwrapArray(result) ?? [];
+    }
+    catch (listError) {
+        try {
+            const fetched = await proxy.execute('product', 'fetch', [productTag]);
+            const product = fetched && typeof fetched === 'object' && 'data' in fetched
+                ? fetched.data
+                : fetched;
+            if (!product || typeof product !== 'object')
+                throw listError;
+            const sessions = unwrapArray(product.sessions) ?? [];
+            return sessions.filter((session) => !session || typeof session !== 'object' || session.deleted !== true);
+        }
+        catch {
+            throw listError;
+        }
+    }
+}
 export function runResourcesList(json) {
     printJson({ resource_types: listResourceTypes() }, json);
 }
@@ -168,11 +205,28 @@ export async function runResourceCrud(typeName, verb, opts, extraArgs) {
             tag,
         };
     }
-    const params = buildCrudParams(module, method, session.project.product_tag, {
+    const productTag = resolveResourceProductTag(opts.product, session.project.product_tag);
+    const params = buildCrudParams(module, method, productTag, {
         tag,
         body: payload,
     });
     const proxy = getSdkProxy(session);
+    if (crud === 'list' && module === 'sessions') {
+        printJson(await listSessionsWithProductFallback(proxy, productTag), Boolean(opts.json));
+        return;
+    }
     const result = await proxy.execute(module, method, params);
+    if (crud === 'create' && module === 'sessions') {
+        const createdTag = String(body?.tag ?? '').trim();
+        if (!createdTag) {
+            throw new Error('Session creation could not be verified because body.tag is missing');
+        }
+        const verified = await proxy.execute(module, 'fetch', buildCrudParams(module, 'fetch', productTag, { tag: createdTag }));
+        if (!verified) {
+            throw new Error(`Session creation returned without an error, but "${createdTag}" was not found during verification`);
+        }
+        printJson({ created: true, session: verified }, Boolean(opts.json));
+        return;
+    }
     printJson(result, Boolean(opts.json));
 }

package/dist/index.js

@@ -112,7 +112,7 @@ workspaces
     .action(wrap((opts) => runWorkspacesCurrent(Boolean(opts.json))));
 workspaces
     .command('use [selector]')
-    .description('Switch active workspace (interactive picker). Updates linked .ductape/config.json if present')
+    .description('Switch active workspace (interactive picker). Updates linked ductape/config.json if present')
     .option('--profile <name>')
     .option('-C, --dir <path>', 'Project directory to sync', process.cwd())
     .option('--json', 'JSON output')
@@ -661,6 +661,7 @@ resources
     .argument('<type>', 'Resource type (e.g. storage, database, cache …)')
     .argument('<verb>', 'list | get | create | update | delete | connect')
     .option('-t, --tag <tag>')
+    .option('--product <tag>', 'Product tag (defaults to linked project)')
     .option('-f, --file <path>', 'JSON body (or use interactive prompts)')
     .option('-i, --interactive', 'Prompt for fields (default in TTY when -f omitted)')
     .option('--no-interactive', 'Require -f JSON for create/update/connect')

package/dist/lib/config.js

@@ -9,6 +9,7 @@ export const GLOBAL_CONFIG_PATH = path.join(GLOBAL_DIR, 'config.json');
 export const HUB_PLATFORM_DIR = path.join(GLOBAL_DIR, 'platform');
 export const PROJECT_CONFIG_DIR = 'ductape';
 export const PROJECT_CONFIG_PATH = path.join(PROJECT_CONFIG_DIR, 'config.json');
+const LEGACY_PROJECT_CONFIG_PATH = path.join('.ductape', 'config.json');
 const DEFAULT_GLOBAL = {
     default_profile: 'cloud',
     profiles: {
@@ -114,10 +115,13 @@ export function findProjectConfig(startDir = process.cwd()) {
     let dir = startDir;
     const root = path.parse(dir).root;
     while (true) {
-        const candidate = path.join(dir, PROJECT_CONFIG_PATH);
-        const cfg = readJson(candidate);
-        if (cfg?.product_tag && (cfg.workspace_tag || cfg.workspace_id)) {
-            return { dir, config: cfg };
+        // The CLI writes ductape/config.json. Read the former hidden path only as
+        // an upgrade fallback; canonical config always wins when both exist.
+        for (const relativePath of [PROJECT_CONFIG_PATH, LEGACY_PROJECT_CONFIG_PATH]) {
+            const cfg = readJson(path.join(dir, relativePath));
+            if (cfg?.product_tag && (cfg.workspace_tag || cfg.workspace_id)) {
+                return { dir, config: cfg };
+            }
         }
         if (dir === root)
             break;

package/package.json

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

package/templates/typescript/ductape.example.ts

@@ -1,6 +1,6 @@
 /**
  * Ductape SDK example — product/env defaults are set on the constructor only.
- * CLI: `ductape login` + `ductape link` (see .ductape/config.json).
+ * CLI: `ductape login` + `ductape link` (see ductape/config.json).
  */
 import Ductape from '@ductape/sdk';