@cxtms/cx-schema 1.6.0 → 1.6.4

package/dist/cli.js

@@ -115,7 +115,7 @@ ${chalk_1.default.bold.yellow('COMMANDS:')}
   ${chalk_1.default.green('pat')}             Manage personal access tokens (create, list, revoke)
   ${chalk_1.default.green('orgs')}            List, select, or set active organization
   ${chalk_1.default.green('appmodule')}       Manage app modules on a CX server (push, delete)
-  ${chalk_1.default.green('workflow')}        Manage workflows on a CX server (push, delete, executions, logs)
+  ${chalk_1.default.green('workflow')}        Manage workflows on a CX server (push, delete, execute, logs, log)
   ${chalk_1.default.green('publish')}         Publish all modules and workflows to a CX server
   ${chalk_1.default.green('schema')}          Show JSON schema for a component or task
   ${chalk_1.default.green('example')}         Show example YAML for a component or task
@@ -139,7 +139,13 @@ ${chalk_1.default.bold.yellow('OPTIONS:')}
   ${chalk_1.default.green('--tasks <list>')}         Comma-separated task enums for create task-schema
   ${chalk_1.default.green('--to <file>')}            Target file for extract command
   ${chalk_1.default.green('--copy')}                 Copy component instead of moving (source unchanged, target gets higher priority)
-  ${chalk_1.default.green('--org <id>')}             Organization ID for appmodule commands
+  ${chalk_1.default.green('--org <id>')}             Organization ID for server commands
+  ${chalk_1.default.green('--vars <json>')}          JSON variables for workflow execute
+  ${chalk_1.default.green('--from <date>')}          Filter logs from date (YYYY-MM-DD)
+  ${chalk_1.default.green('--to <date>')}            Filter logs to date (YYYY-MM-DD)
+  ${chalk_1.default.green('--output <file>')}        Save workflow log to file (or -o)
+  ${chalk_1.default.green('--console')}              Print workflow log to stdout
+  ${chalk_1.default.green('--json')}                 Download JSON log instead of text
 
 ${chalk_1.default.bold.yellow('VALIDATION EXAMPLES:')}
   ${chalk_1.default.gray('# Validate a module YAML file')}
@@ -209,10 +215,7 @@ ${chalk_1.default.bold.yellow('AUTH COMMANDS:')}
   ${chalk_1.default.gray('# Login to a CX environment')}
   ${chalk_1.default.cyan(`${PROGRAM_NAME} login https://qa.storevista.acuitive.net`)}
 
-  ${chalk_1.default.gray('# Logout from a CX environment')}
-  ${chalk_1.default.cyan(`${PROGRAM_NAME} logout https://qa.storevista.acuitive.net`)}
-
-  ${chalk_1.default.gray('# List stored sessions')}
+  ${chalk_1.default.gray('# Logout from current session')}
   ${chalk_1.default.cyan(`${PROGRAM_NAME} logout`)}
 
 ${chalk_1.default.bold.yellow('PAT COMMANDS:')}
@@ -258,12 +261,20 @@ ${chalk_1.default.bold.yellow('WORKFLOW COMMANDS:')}
   ${chalk_1.default.gray('# Delete a workflow by UUID')}
   ${chalk_1.default.cyan(`${PROGRAM_NAME} workflow delete <workflowId>`)}
 
-  ${chalk_1.default.gray('# List recent executions for a workflow')}
-  ${chalk_1.default.cyan(`${PROGRAM_NAME} workflow executions <workflowId>`)}
-  ${chalk_1.default.cyan(`${PROGRAM_NAME} workflow executions workflows/my-workflow.yaml`)}
+  ${chalk_1.default.gray('# Execute a workflow')}
+  ${chalk_1.default.cyan(`${PROGRAM_NAME} workflow execute <workflowId|file.yaml>`)}
+  ${chalk_1.default.cyan(`${PROGRAM_NAME} workflow execute <workflowId> --vars '{"city":"London"}'`)}
+
+  ${chalk_1.default.gray('# List execution logs for a workflow (sorted desc)')}
+  ${chalk_1.default.cyan(`${PROGRAM_NAME} workflow logs <workflowId|file.yaml>`)}
+  ${chalk_1.default.cyan(`${PROGRAM_NAME} workflow logs <workflowId> --from 2026-01-01 --to 2026-01-31`)}
 
-  ${chalk_1.default.gray('# Show execution details and logs')}
-  ${chalk_1.default.cyan(`${PROGRAM_NAME} workflow logs <executionId>`)}
+  ${chalk_1.default.gray('# Download a specific execution log')}
+  ${chalk_1.default.cyan(`${PROGRAM_NAME} workflow log <executionId>`)}                  ${chalk_1.default.gray('# save txt log to temp dir')}
+  ${chalk_1.default.cyan(`${PROGRAM_NAME} workflow log <executionId> --output log.txt`)}  ${chalk_1.default.gray('# save to file')}
+  ${chalk_1.default.cyan(`${PROGRAM_NAME} workflow log <executionId> --console`)}         ${chalk_1.default.gray('# print to stdout')}
+  ${chalk_1.default.cyan(`${PROGRAM_NAME} workflow log <executionId> --json`)}            ${chalk_1.default.gray('# download JSON log (more detail)')}
+  ${chalk_1.default.cyan(`${PROGRAM_NAME} workflow log <executionId> --json --console`)}  ${chalk_1.default.gray('# JSON log to stdout')}
 
 ${chalk_1.default.bold.yellow('PUBLISH COMMANDS:')}
   ${chalk_1.default.gray('# Publish all modules and workflows from current project')}
@@ -1454,28 +1465,33 @@ function runSetupClaude() {
 // ============================================================================
 const AUTH_CALLBACK_PORT = 9000;
 const AUTH_TIMEOUT_MS = 2 * 60 * 1000; // 2 minutes
-function getTokenDir() {
-    return path.join(os.homedir(), '.cxtms');
+function getSessionDir() {
+    const projectName = path.basename(process.cwd());
+    return path.join(os.homedir(), '.cxtms', projectName);
 }
-function getTokenFilePath(domain) {
-    const hostname = new URL(domain).hostname;
-    return path.join(getTokenDir(), `${hostname}.json`);
+function getSessionFilePath() {
+    return path.join(getSessionDir(), '.session.json');
 }
-function readTokenFile(domain) {
-    const filePath = getTokenFilePath(domain);
+function readSessionFile() {
+    const filePath = getSessionFilePath();
     if (!fs.existsSync(filePath))
         return null;
-    return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+    try {
+        return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+    }
+    catch {
+        return null;
+    }
 }
-function writeTokenFile(data) {
-    const dir = getTokenDir();
+function writeSessionFile(data) {
+    const dir = getSessionDir();
     if (!fs.existsSync(dir)) {
         fs.mkdirSync(dir, { recursive: true });
     }
-    fs.writeFileSync(getTokenFilePath(data.domain), JSON.stringify(data, null, 2), 'utf-8');
+    fs.writeFileSync(getSessionFilePath(), JSON.stringify(data, null, 2), 'utf-8');
 }
-function deleteTokenFile(domain) {
-    const filePath = getTokenFilePath(domain);
+function deleteSessionFile() {
+    const filePath = getSessionFilePath();
     if (fs.existsSync(filePath)) {
         fs.unlinkSync(filePath);
     }
@@ -1615,7 +1631,7 @@ async function refreshTokens(stored) {
         refresh_token: data.refresh_token || stored.refresh_token,
         expires_at: Math.floor(Date.now() / 1000) + (data.expires_in || 3600),
     };
-    writeTokenFile(updated);
+    writeSessionFile(updated);
     return updated;
 }
 async function runLogin(domain) {
@@ -1659,51 +1675,30 @@ async function runLogin(domain) {
     // Step 6: Exchange code for tokens
     console.log(chalk_1.default.gray('  Exchanging authorization code...'));
     const tokens = await exchangeCodeForTokens(domain, clientId, code, codeVerifier);
-    // Step 7: Store tokens
-    writeTokenFile(tokens);
+    // Step 7: Store session locally
+    writeSessionFile(tokens);
     close();
     console.log(chalk_1.default.green(`  ✓ Logged in to ${new URL(domain).hostname}`));
-    console.log(chalk_1.default.gray(`  Token stored at: ${getTokenFilePath(domain)}\n`));
-}
-async function runLogout(domain) {
-    if (!domain) {
-        // List stored sessions
-        const dir = getTokenDir();
-        if (!fs.existsSync(dir)) {
-            console.log(chalk_1.default.gray('\n  No stored sessions.\n'));
-            return;
-        }
-        const files = fs.readdirSync(dir).filter(f => f.endsWith('.json'));
-        if (files.length === 0) {
-            console.log(chalk_1.default.gray('\n  No stored sessions.\n'));
-            return;
-        }
-        console.log(chalk_1.default.bold.cyan('\n  Stored sessions:\n'));
-        for (const f of files) {
-            const hostname = f.replace('.json', '');
-            console.log(chalk_1.default.white(`    ${hostname}`));
-        }
-        console.log(chalk_1.default.gray(`\n  Usage: ${PROGRAM_NAME} logout <url>\n`));
-        return;
-    }
-    // Normalize URL
-    if (!domain.startsWith('http://') && !domain.startsWith('https://')) {
-        domain = `https://${domain}`;
-    }
-    domain = domain.replace(/\/+$/, '');
-    const stored = readTokenFile(domain);
-    if (!stored) {
-        console.log(chalk_1.default.gray(`\n  No session found for ${new URL(domain).hostname}\n`));
+    console.log(chalk_1.default.gray(`  Session stored at: ${getSessionFilePath()}\n`));
+}
+async function runLogout(_domain) {
+    const session = readSessionFile();
+    if (!session) {
+        console.log(chalk_1.default.gray('\n  No active session in this project.\n'));
+        console.log(chalk_1.default.gray(`  Login first: ${PROGRAM_NAME} login <url>\n`));
         return;
     }
     console.log(chalk_1.default.bold.cyan('\n  CX CLI Logout\n'));
+    console.log(chalk_1.default.gray(`  Server: ${new URL(session.domain).hostname}`));
     // Revoke tokens (non-fatal)
-    console.log(chalk_1.default.gray('  Revoking tokens...'));
-    await revokeToken(domain, stored.client_id, stored.access_token);
-    await revokeToken(domain, stored.client_id, stored.refresh_token);
-    // Delete local file
-    deleteTokenFile(domain);
-    console.log(chalk_1.default.green(`  ✓ Logged out from ${new URL(domain).hostname}\n`));
+    if (session.client_id && session.refresh_token) {
+        console.log(chalk_1.default.gray('  Revoking tokens...'));
+        await revokeToken(session.domain, session.client_id, session.access_token);
+        await revokeToken(session.domain, session.client_id, session.refresh_token);
+    }
+    // Delete local session file
+    deleteSessionFile();
+    console.log(chalk_1.default.green(`  ✓ Logged out from ${new URL(session.domain).hostname}\n`));
 }
 // ============================================================================
 // AppModule Commands
@@ -1716,7 +1711,7 @@ async function graphqlRequest(domain, token, query, variables) {
         if (process.env.CXTMS_AUTH)
             throw new Error('PAT token unauthorized (401). Check your CXTMS_AUTH token.');
         // Try refresh for OAuth sessions
-        const stored = readTokenFile(domain);
+        const stored = readSessionFile();
         if (!stored)
             throw new Error('Session expired. Run `cx-cli login <url>` again.');
         try {
@@ -1808,43 +1803,20 @@ function resolveSession() {
             expires_at: 0,
         };
     }
-    // 1. Check app.yaml in CWD for server field
-    const appDomain = resolveDomainFromAppYaml();
-    if (appDomain) {
-        const stored = readTokenFile(appDomain);
-        if (stored)
-            return stored;
-        console.error(chalk_1.default.red(`Not logged in to ${appDomain}. Run \`cx-cli login ${appDomain}\` first.`));
-        process.exit(2);
-    }
-    // 2. Check for single session
-    const dir = getTokenDir();
-    if (!fs.existsSync(dir)) {
-        console.error(chalk_1.default.red('Not logged in. Run `cx-cli login <url>` first.'));
-        process.exit(2);
-    }
-    const files = fs.readdirSync(dir).filter(f => f.endsWith('.json'));
-    if (files.length === 0) {
-        console.error(chalk_1.default.red('Not logged in. Run `cx-cli login <url>` first.'));
-        process.exit(2);
-    }
-    if (files.length === 1) {
-        return JSON.parse(fs.readFileSync(path.join(dir, files[0]), 'utf-8'));
-    }
-    // 3. Multiple sessions — error
-    console.error(chalk_1.default.red('Multiple sessions found:'));
-    for (const f of files) {
-        console.error(chalk_1.default.white(`  ${f.replace('.json', '')}`));
-    }
-    console.error(chalk_1.default.gray('Add `server` field to app.yaml or use a single login session.'));
+    // 1. Check local .cxtms/.session.json
+    const session = readSessionFile();
+    if (session)
+        return session;
+    // 2. Not logged in
+    console.error(chalk_1.default.red('Not logged in. Run `cx-cli login <url>` first.'));
     process.exit(2);
 }
 async function resolveOrgId(domain, token, override) {
     // 1. Explicit override
     if (override !== undefined)
         return override;
-    // 2. Cached in token file
-    const stored = readTokenFile(domain);
+    // 2. Cached in session file
+    const stored = readSessionFile();
     if (stored?.organization_id)
         return stored.organization_id;
     // 3. Query server
@@ -1860,7 +1832,7 @@ async function resolveOrgId(domain, token, override) {
         // Cache it
         if (stored) {
             stored.organization_id = orgId;
-            writeTokenFile(stored);
+            writeSessionFile(stored);
         }
         return orgId;
     }
@@ -2068,9 +2040,9 @@ async function runOrgsUse(orgIdStr) {
         console.error('');
         process.exit(2);
     }
-    // Save to token file
+    // Save to session file
     session.organization_id = orgId;
-    writeTokenFile(session);
+    writeSessionFile(session);
     console.log(chalk_1.default.green(`\n  ✓ Context set to: ${match.companyName} (${orgId})\n`));
 }
 async function runOrgsSelect() {
@@ -2109,7 +2081,7 @@ async function runOrgsSelect() {
     }
     const selected = orgs[idx];
     session.organization_id = selected.organizationId;
-    writeTokenFile(session);
+    writeSessionFile(session);
     console.log(chalk_1.default.green(`\n  ✓ Context set to: ${selected.companyName} (${selected.organizationId})\n`));
 }
 // ============================================================================
@@ -2213,18 +2185,18 @@ async function runWorkflowDelete(uuid, orgOverride) {
     });
     console.log(chalk_1.default.green(`  ✓ Deleted: ${uuid}\n`));
 }
-async function runWorkflowExecutions(workflowIdOrFile, orgOverride) {
+async function runWorkflowExecute(workflowIdOrFile, orgOverride, variables) {
     if (!workflowIdOrFile) {
         console.error(chalk_1.default.red('Error: Workflow ID or YAML file required'));
-        console.error(chalk_1.default.gray(`Usage: ${PROGRAM_NAME} workflow executions <workflowId|file.yaml> [--org <id>]`));
+        console.error(chalk_1.default.gray(`Usage: ${PROGRAM_NAME} workflow execute <workflowId|file.yaml> [--org <id>] [--vars '{"key":"value"}']`));
         process.exit(2);
     }
     const session = resolveSession();
-    const domain = session.domain;
-    const token = session.access_token;
+    const { domain, access_token: token } = session;
     const orgId = await resolveOrgId(domain, token, orgOverride);
-    // Resolve workflowId — accept UUID directly or extract from YAML file
+    // Resolve workflowId
     let workflowId = workflowIdOrFile;
+    let workflowName = workflowIdOrFile;
     if (workflowIdOrFile.endsWith('.yaml') || workflowIdOrFile.endsWith('.yml')) {
         if (!fs.existsSync(workflowIdOrFile)) {
             console.error(chalk_1.default.red(`Error: File not found: ${workflowIdOrFile}`));
@@ -2232,54 +2204,181 @@ async function runWorkflowExecutions(workflowIdOrFile, orgOverride) {
         }
         const parsed = yaml_1.default.parse(fs.readFileSync(workflowIdOrFile, 'utf-8'));
         workflowId = parsed?.workflow?.workflowId;
+        workflowName = parsed?.workflow?.name || path.basename(workflowIdOrFile);
         if (!workflowId) {
             console.error(chalk_1.default.red('Error: Workflow YAML is missing workflow.workflowId'));
             process.exit(2);
         }
     }
+    // Parse variables if provided
+    let vars;
+    if (variables) {
+        try {
+            vars = JSON.parse(variables);
+        }
+        catch {
+            console.error(chalk_1.default.red('Error: --vars must be valid JSON'));
+            process.exit(2);
+        }
+    }
+    console.log(chalk_1.default.bold.cyan('\n  Workflow Execute\n'));
+    console.log(chalk_1.default.gray(`  Server:    ${new URL(domain).hostname}`));
+    console.log(chalk_1.default.gray(`  Org:       ${orgId}`));
+    console.log(chalk_1.default.gray(`  Workflow:  ${workflowName}`));
+    if (vars)
+        console.log(chalk_1.default.gray(`  Variables: ${JSON.stringify(vars)}`));
+    console.log('');
+    const input = { organizationId: orgId, workflowId };
+    if (vars)
+        input.variables = vars;
+    const data = await graphqlRequest(domain, token, `
+    mutation ($input: ExecuteWorkflowInput!) {
+      executeWorkflow(input: $input) {
+        workflowExecutionResult {
+          executionId workflowId isAsync workflowType outputs
+        }
+      }
+    }
+  `, { input });
+    const result = data?.executeWorkflow?.workflowExecutionResult;
+    if (!result) {
+        console.error(chalk_1.default.red('  No execution result returned.\n'));
+        process.exit(2);
+    }
+    console.log(chalk_1.default.green(`  ✓ Executed: ${workflowName}`));
+    console.log(chalk_1.default.white(`  Execution ID: ${result.executionId}`));
+    console.log(chalk_1.default.white(`  Async:        ${result.isAsync}`));
+    console.log(chalk_1.default.white(`  Type:         ${result.workflowType || 'standard'}`));
+    if (result.outputs && Object.keys(result.outputs).length > 0) {
+        console.log(chalk_1.default.white(`  Outputs:`));
+        console.log(chalk_1.default.gray(`    ${JSON.stringify(result.outputs, null, 2).split('\n').join('\n    ')}`));
+    }
+    console.log('');
+}
+function resolveWorkflowId(workflowIdOrFile) {
+    if (workflowIdOrFile.endsWith('.yaml') || workflowIdOrFile.endsWith('.yml')) {
+        if (!fs.existsSync(workflowIdOrFile)) {
+            console.error(chalk_1.default.red(`Error: File not found: ${workflowIdOrFile}`));
+            process.exit(2);
+        }
+        const parsed = yaml_1.default.parse(fs.readFileSync(workflowIdOrFile, 'utf-8'));
+        const id = parsed?.workflow?.workflowId;
+        if (!id) {
+            console.error(chalk_1.default.red('Error: Workflow YAML is missing workflow.workflowId'));
+            process.exit(2);
+        }
+        return id;
+    }
+    return workflowIdOrFile;
+}
+async function runWorkflowLogs(workflowIdOrFile, orgOverride, fromDate, toDate) {
+    if (!workflowIdOrFile) {
+        console.error(chalk_1.default.red('Error: Workflow ID or YAML file required'));
+        console.error(chalk_1.default.gray(`Usage: ${PROGRAM_NAME} workflow logs <workflowId|file.yaml> [--from <date>] [--to <date>]`));
+        process.exit(2);
+    }
+    const session = resolveSession();
+    const { domain, access_token: token } = session;
+    const orgId = await resolveOrgId(domain, token, orgOverride);
+    const workflowId = resolveWorkflowId(workflowIdOrFile);
+    // Parse date filters
+    const fromTs = fromDate ? new Date(fromDate).getTime() : 0;
+    const toTs = toDate ? new Date(toDate + 'T23:59:59').getTime() : Infinity;
+    if (fromDate && isNaN(fromTs)) {
+        console.error(chalk_1.default.red(`Invalid --from date: ${fromDate}. Use YYYY-MM-DD format.`));
+        process.exit(2);
+    }
+    if (toDate && isNaN(toTs)) {
+        console.error(chalk_1.default.red(`Invalid --to date: ${toDate}. Use YYYY-MM-DD format.`));
+        process.exit(2);
+    }
     const data = await graphqlRequest(domain, token, `
     query ($organizationId: Int!, $workflowId: UUID!) {
-      workflowExecutions(organizationId: $organizationId, workflowId: $workflowId, take: 25) {
+      workflowExecutions(organizationId: $organizationId, workflowId: $workflowId, take: 100) {
         totalCount
-        items { executionId executionStatus executedAt durationMs userId }
+        items { executionId executionStatus executedAt durationMs txtLogUrl user { fullName email } }
       }
     }
   `, { organizationId: orgId, workflowId });
-    const items = data?.workflowExecutions?.items || [];
+    let items = data?.workflowExecutions?.items || [];
     const total = data?.workflowExecutions?.totalCount || 0;
-    console.log(chalk_1.default.bold.cyan('\n  Workflow Executions\n'));
+    // Filter by date range
+    if (fromDate || toDate) {
+        items = items.filter((ex) => {
+            const t = new Date(ex.executedAt).getTime();
+            return t >= fromTs && t <= toTs;
+        });
+    }
+    // Sort descending
+    items.sort((a, b) => new Date(b.executedAt).getTime() - new Date(a.executedAt).getTime());
+    console.log(chalk_1.default.bold.cyan('\n  Workflow Logs\n'));
     console.log(chalk_1.default.gray(`  Server:    ${new URL(domain).hostname}`));
     console.log(chalk_1.default.gray(`  Workflow:  ${workflowId}`));
-    console.log(chalk_1.default.gray(`  Total:     ${total}\n`));
+    console.log(chalk_1.default.gray(`  Total:     ${total}`));
+    if (fromDate || toDate) {
+        console.log(chalk_1.default.gray(`  Filter:    ${fromDate || '...'} → ${toDate || '...'}`));
+    }
+    console.log(chalk_1.default.gray(`  Showing:   ${items.length}\n`));
     if (items.length === 0) {
         console.log(chalk_1.default.gray('  No executions found.\n'));
         return;
     }
-    // Sort descending by executedAt (API may not support ordering)
-    items.sort((a, b) => new Date(b.executedAt).getTime() - new Date(a.executedAt).getTime());
     for (const ex of items) {
         const date = new Date(ex.executedAt).toLocaleString();
         const duration = ex.durationMs != null ? `${(ex.durationMs / 1000).toFixed(1)}s` : '?';
         const statusColor = ex.executionStatus === 'Success' ? chalk_1.default.green : ex.executionStatus === 'Failed' ? chalk_1.default.red : chalk_1.default.yellow;
-        console.log(chalk_1.default.white(`    ${ex.executionId}  ${statusColor(ex.executionStatus.padEnd(10))}  ${date}  ${chalk_1.default.gray(duration)}`));
+        const logIcon = ex.txtLogUrl ? chalk_1.default.green('●') : chalk_1.default.gray('○');
+        const user = ex.user?.fullName || ex.user?.email || '';
+        console.log(`  ${logIcon} ${chalk_1.default.white(ex.executionId)}  ${statusColor(ex.executionStatus.padEnd(10))}  ${date}  ${chalk_1.default.gray(duration)}${user ? '  ' + chalk_1.default.gray(user) : ''}`);
     }
-    console.log('');
+    console.log();
+    console.log(chalk_1.default.gray(`  ${chalk_1.default.green('●')} log available  ${chalk_1.default.gray('○')} no log`));
+    console.log(chalk_1.default.gray(`  Download: ${PROGRAM_NAME} workflow log <executionId> [--output <file>] [--console]\n`));
 }
-async function runWorkflowLogs(executionId, orgOverride) {
+function fetchGzipText(url) {
+    const zlib = require('zlib');
+    return new Promise((resolve, reject) => {
+        const lib = url.startsWith('https') ? https : http;
+        lib.get(url, (res) => {
+            if (res.statusCode !== 200) {
+                reject(new Error(`HTTP ${res.statusCode}`));
+                res.resume();
+                return;
+            }
+            const rawChunks = [];
+            res.on('data', (chunk) => rawChunks.push(chunk));
+            res.on('end', () => {
+                const raw = Buffer.concat(rawChunks);
+                if (raw.length === 0) {
+                    resolve('(empty log)');
+                    return;
+                }
+                zlib.gunzip(raw, (err, result) => {
+                    if (err) {
+                        resolve(raw.toString('utf-8'));
+                        return;
+                    }
+                    resolve(result.toString('utf-8'));
+                });
+            });
+        }).on('error', reject);
+    });
+}
+async function runWorkflowLog(executionId, orgOverride, outputFile, toConsole, useJson) {
     if (!executionId) {
         console.error(chalk_1.default.red('Error: Execution ID required'));
-        console.error(chalk_1.default.gray(`Usage: ${PROGRAM_NAME} workflow logs <executionId> [--org <id>]`));
+        console.error(chalk_1.default.gray(`Usage: ${PROGRAM_NAME} workflow log <executionId> [--output <file>] [--console] [--json]`));
         process.exit(2);
     }
     const session = resolveSession();
-    const domain = session.domain;
-    const token = session.access_token;
+    const { domain, access_token: token } = session;
     const orgId = await resolveOrgId(domain, token, orgOverride);
-    // Fetch execution details
     const data = await graphqlRequest(domain, token, `
     query ($organizationId: Int!, $executionId: UUID!) {
       workflowExecution(organizationId: $organizationId, executionId: $executionId) {
         executionId workflowId executionStatus executedAt durationMs
+        txtLogUrl jsonLogUrl
+        user { fullName email }
       }
     }
   `, { organizationId: orgId, executionId });
@@ -2288,49 +2387,60 @@ async function runWorkflowLogs(executionId, orgOverride) {
         console.error(chalk_1.default.red(`Execution not found: ${executionId}`));
         process.exit(2);
     }
+    const logUrl = useJson ? ex.jsonLogUrl : ex.txtLogUrl;
+    const logType = useJson ? 'json' : 'txt';
+    const ext = useJson ? '.json' : '.log';
+    if (!logUrl) {
+        console.error(chalk_1.default.yellow(`No ${logType} log available for this execution.`));
+        process.exit(0);
+    }
     const date = new Date(ex.executedAt).toLocaleString();
     const duration = ex.durationMs != null ? `${(ex.durationMs / 1000).toFixed(1)}s` : '?';
     const statusColor = ex.executionStatus === 'Success' ? chalk_1.default.green : ex.executionStatus === 'Failed' ? chalk_1.default.red : chalk_1.default.yellow;
-    console.log(chalk_1.default.bold.cyan('\n  Workflow Execution\n'));
-    console.log(chalk_1.default.white(`  ID:        ${ex.executionId}`));
-    console.log(chalk_1.default.white(`  Workflow:  ${ex.workflowId}`));
-    console.log(chalk_1.default.white(`  Status:    ${statusColor(ex.executionStatus)}`));
-    console.log(chalk_1.default.white(`  Executed:  ${date}`));
-    console.log(chalk_1.default.white(`  Duration:  ${duration}`));
-    // Try to fetch log via REST endpoint
-    const logUrl = `${domain}/api/workflow-executions/${executionId}/log?organizationId=${orgId}`;
+    const userName = ex.user?.fullName || ex.user?.email || '';
+    // Download log
+    let logText;
     try {
-        const logRes = await new Promise((resolve, reject) => {
-            const parsed = new URL(logUrl);
-            const isHttps = parsed.protocol === 'https:';
-            const lib = isHttps ? https : http;
-            const req = lib.request({
-                hostname: parsed.hostname,
-                port: parsed.port || (isHttps ? 443 : 80),
-                path: parsed.pathname + parsed.search,
-                method: 'GET',
-                headers: { 'Authorization': `Bearer ${token}` },
-            }, (res) => {
-                let d = '';
-                res.on('data', (chunk) => d += chunk);
-                res.on('end', () => resolve({ statusCode: res.statusCode || 0, body: d }));
-            });
-            req.on('error', reject);
-            req.end();
-        });
-        if (logRes.statusCode === 200 && logRes.body) {
-            console.log(chalk_1.default.gray('\n  --- Log ---\n'));
-            console.log(logRes.body);
-        }
-        else {
-            console.log(chalk_1.default.gray('\n  Logs not available via REST API.'));
-            console.log(chalk_1.default.gray(`  Use TMS MCP to download execution logs.\n`));
-        }
+        logText = await fetchGzipText(logUrl);
     }
-    catch {
-        console.log(chalk_1.default.gray('\n  Logs not available via REST API.'));
-        console.log(chalk_1.default.gray(`  Use TMS MCP to download execution logs.\n`));
+    catch (e) {
+        console.error(chalk_1.default.red(`Failed to download log: ${e.message}`));
+        process.exit(2);
+    }
+    // Pretty-print JSON if it's valid JSON
+    if (useJson) {
+        try {
+            const parsed = JSON.parse(logText);
+            logText = JSON.stringify(parsed, null, 2);
+        }
+        catch { /* keep as-is */ }
+    }
+    if (toConsole) {
+        console.log(chalk_1.default.bold.cyan('\n  Workflow Execution\n'));
+        console.log(chalk_1.default.white(`  ID:        ${ex.executionId}`));
+        console.log(chalk_1.default.white(`  Workflow:  ${ex.workflowId}`));
+        console.log(chalk_1.default.white(`  Status:    ${statusColor(ex.executionStatus)}`));
+        console.log(chalk_1.default.white(`  Executed:  ${date}`));
+        console.log(chalk_1.default.white(`  Duration:  ${duration}`));
+        if (userName)
+            console.log(chalk_1.default.white(`  User:      ${userName}`));
+        console.log(chalk_1.default.gray(`\n  --- ${logType.toUpperCase()} Log ---\n`));
+        console.log(logText);
+        return;
+    }
+    // Save to file
+    let filePath;
+    if (outputFile) {
+        filePath = path.resolve(outputFile);
+    }
+    else {
+        const tmpDir = os.tmpdir();
+        const dateStr = new Date(ex.executedAt).toISOString().slice(0, 10);
+        filePath = path.join(tmpDir, `workflow-${ex.workflowId}-${dateStr}-${executionId}${ext}`);
     }
+    fs.writeFileSync(filePath, logText, 'utf-8');
+    console.log(chalk_1.default.green(`  ✓ ${logType.toUpperCase()} log saved: ${filePath}`));
+    console.log(chalk_1.default.gray(`    Execution: ${executionId}  ${statusColor(ex.executionStatus)}  ${date}  ${duration}`));
 }
 // ============================================================================
 // Publish Command
@@ -2942,6 +3052,21 @@ function parseArgs(args) {
             }
             options.orgId = parsed;
         }
+        else if (arg === '--vars') {
+            options.vars = args[++i];
+        }
+        else if (arg === '--from') {
+            options.from = args[++i];
+        }
+        else if (arg === '--to') {
+            options.to = args[++i];
+        }
+        else if (arg === '--output' || arg === '-o') {
+            options.output = args[++i];
+        }
+        else if (arg === '--console') {
+            options.console = true;
+        }
         else if (!arg.startsWith('-')) {
             files.push(arg);
         }
@@ -3822,15 +3947,18 @@ async function main() {
         else if (sub === 'delete') {
             await runWorkflowDelete(files[1], options.orgId);
         }
-        else if (sub === 'executions') {
-            await runWorkflowExecutions(files[1], options.orgId);
+        else if (sub === 'execute') {
+            await runWorkflowExecute(files[1], options.orgId, options.vars);
         }
         else if (sub === 'logs') {
-            await runWorkflowLogs(files[1], options.orgId);
+            await runWorkflowLogs(files[1], options.orgId, options.from, options.to);
+        }
+        else if (sub === 'log') {
+            await runWorkflowLog(files[1], options.orgId, options.output, options.console, options.format === 'json');
         }
         else {
             console.error(chalk_1.default.red(`Unknown workflow subcommand: ${sub || '(none)'}`));
-            console.error(chalk_1.default.gray(`Usage: ${PROGRAM_NAME} workflow <push|delete|executions|logs> ...`));
+            console.error(chalk_1.default.gray(`Usage: ${PROGRAM_NAME} workflow <push|delete|execute|logs|log> ...`));
             process.exit(2);
         }
         process.exit(0);