@marktoflow/cli 2.0.0-alpha.11 → 2.0.0-alpha.13

package/README.md

@@ -2,11 +2,25 @@
 
 > **Author:** Scott Glover <scottgl@gmail.com>
 
-Agent automation framework with native MCP support - Command Line Interface.
+**CLI-first agent automation framework** with native MCP support and direct SDK integration.
 
-## Overview
+**Version:** 2.0.0-alpha.13
 
-`@marktoflow/cli` is the main package for marktoflow, providing the command-line interface for creating, running, and managing automation workflows.
+---
+
+## What is marktoflow?
+
+marktoflow is a **CLI-first automation framework** that lets you define workflows in Markdown + YAML and execute them across 30+ services. Write workflows as code, run them from the terminal, and optionally use the visual designer for editing.
+
+**Key Differentiators:**
+
+- 🖥️ **CLI-First** - Design and run workflows from your terminal
+- 📝 **Workflows as Markdown** - Human-readable, version-controlled automation
+- 🔌 **Native SDK Integration** - Direct method calls with full type safety
+- 🤖 **AI Agent Support** - GitHub Copilot, Claude, Ollama - use existing subscriptions
+- 🌐 **Universal REST Client** - Connect to any API without custom integrations
+- 🎨 **Visual Designer (Optional)** - Web-based drag-and-drop editor
+- 🏢 **Enterprise Ready** - RBAC, approvals, audit logging, cost tracking
 
 ## Features
 
@@ -38,7 +52,7 @@ npx @marktoflow/cli@alpha <command>
 ### Install from GitHub
 
 ```bash
-npm install -g github:scottgl9/marktoflow#main
+npm install -g github:marktoflow/marktoflow#main
 ```
 
 ## Quick Start
@@ -280,6 +294,18 @@ marktoflow new code-review --output workflows/code-review.md
 marktoflow new
 ```
 
+**Available Templates:**
+
+Built-in templates match the examples/ directory:
+- `code-review` - Automated GitHub PR review
+- `daily-standup` - Jira/Slack standup automation
+- `incident-response` - Multi-service incident coordination
+- `dependency-update` - Package update automation
+- `sprint-planning` - AI-assisted sprint planning
+- `web-automation` - Playwright browser automation
+- `gmail-notification` - Email automation
+- And more...
+
 ### Agent & Tool Management
 
 #### `marktoflow agents list`
@@ -372,7 +398,29 @@ logging:
   file: .marktoflow/logs/marktoflow.log
 ```
 
-## Examples
+## Production Examples
+
+The [examples/](https://github.com/marktoflow/marktoflow/tree/main/examples) directory contains 14+ production-ready workflow templates you can use as starting points:
+
+- **[code-review](https://github.com/marktoflow/marktoflow/tree/main/examples/code-review)** - Automated GitHub PR review with security, performance, and quality checks
+- **[copilot-code-review](https://github.com/marktoflow/marktoflow/tree/main/examples/copilot-code-review)** - Advanced review using GitHub Copilot SDK
+- **[daily-standup](https://github.com/marktoflow/marktoflow/tree/main/examples/daily-standup)** - Jira + Slack activity aggregation with AI summaries
+- **[dependency-update](https://github.com/marktoflow/marktoflow/tree/main/examples/dependency-update)** - Automated package updates with AI changelogs
+- **[incident-response](https://github.com/marktoflow/marktoflow/tree/main/examples/incident-response)** - PagerDuty + Slack + Jira coordination
+- **[sprint-planning](https://github.com/marktoflow/marktoflow/tree/main/examples/sprint-planning)** - Velocity analysis + AI story selection
+- **[doc-maintenance](https://github.com/marktoflow/marktoflow/tree/main/examples/doc-maintenance)** - Smart documentation updates using Ollama
+- **[web-automation](https://github.com/marktoflow/marktoflow/tree/main/examples/web-automation)** - Playwright-based browser automation
+- **[gmail-notification](https://github.com/marktoflow/marktoflow/tree/main/examples/gmail-notification)** - Email automation with Gmail API
+- **[linear-sync](https://github.com/marktoflow/marktoflow/tree/main/examples/linear-sync)** - Linear issue tracking sync
+- **[codebase-qa](https://github.com/marktoflow/marktoflow/tree/main/examples/codebase-qa)** - AI-powered codebase Q&A
+
+Run any example:
+
+```bash
+marktoflow run examples/daily-standup/workflow.md
+```
+
+## CLI Examples
 
 ### Daily Standup Report
 

package/dist/index.d.ts

@@ -2,7 +2,7 @@
 /**
  * marktoflow CLI
  *
- * Universal automation framework with native MCP support.
+ * Agent automation framework with native MCP support.
  */
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -2,7 +2,7 @@
 /**
  * marktoflow CLI
  *
- * Universal automation framework with native MCP support.
+ * Agent automation framework with native MCP support.
  */
 import { Command } from 'commander';
 import chalk from 'chalk';
@@ -13,12 +13,14 @@ import { parseFile, WorkflowEngine, SDKRegistry, createSDKStepExecutor, StepStat
 import { registerIntegrations } from '@marktoflow/integrations';
 import { workerCommand } from './worker.js';
 import { triggerCommand } from './trigger.js';
+import { serveCommand } from './serve.js';
 import { runWorkflowWizard, listTemplates } from './commands/new.js';
 import { runUpdateWizard, listAgents } from './commands/update.js';
 import { parse as parseYaml } from 'yaml';
 import { executeDryRun, displayDryRunSummary } from './commands/dry-run.js';
 import { WorkflowDebugger, parseBreakpoints } from './commands/debug.js';
-const VERSION = '2.0.0-alpha.7';
+import { parseInputPairs, debugLogInputs, validateAndApplyDefaults, printMissingInputsError, overrideAgentInWorkflow, debugLogAgentOverride, overrideModelInWorkflow, } from './utils/index.js';
+const VERSION = '2.0.0-alpha.13';
 // Load environment variables from .env files on CLI startup
 loadEnv();
 function getConfig() {
@@ -36,16 +38,62 @@ function isBundle(path) {
         return false;
     }
 }
+/**
+ * Map agent provider aliases to SDK names
+ */
+function getAgentSDKName(provider) {
+    const providerMap = {
+        'claude': 'claude-code',
+        'claude-code': 'claude-code',
+        'claude-agent': 'claude-agent',
+        'copilot': 'github-copilot',
+        'github-copilot': 'github-copilot',
+        'opencode': 'opencode',
+        'ollama': 'ollama',
+        'codex': 'codex',
+    };
+    const normalized = provider.toLowerCase();
+    const sdkName = providerMap[normalized];
+    if (!sdkName) {
+        throw new Error(`Unknown agent provider: ${provider}. Available: ${Object.keys(providerMap).join(', ')}`);
+    }
+    return sdkName;
+}
+/**
+ * Get default auth configuration for an agent provider
+ */
+function getAgentAuthConfig(sdkName) {
+    const authConfigs = {
+        'claude-code': {
+            api_key: '${ANTHROPIC_API_KEY}',
+        },
+        'claude-agent': {
+            api_key: '${ANTHROPIC_API_KEY}',
+        },
+        'github-copilot': {
+            token: '${GITHUB_TOKEN}',
+        },
+        'opencode': {},
+        'ollama': {
+            base_url: '${OLLAMA_BASE_URL:-http://localhost:11434}',
+        },
+        'codex': {
+            api_key: '${OPENAI_API_KEY}',
+        },
+    };
+    return authConfigs[sdkName] || {};
+}
 // ============================================================================
 // CLI Setup
 // ============================================================================
 const program = new Command();
 program
     .name('marktoflow')
-    .description('Universal automation framework with native MCP support')
+    .description('Agent automation framework with native MCP support')
     .version(VERSION);
 program.addCommand(workerCommand);
 program.addCommand(triggerCommand);
+program.addCommand(serveCommand);
 // ============================================================================
 // Commands
 // ============================================================================
@@ -84,7 +132,7 @@ workflow:
 
 steps:
   - id: greet
-    action: console.log
+    action: core.log
     inputs:
       message: "Hello from marktoflow!"
 ---
@@ -154,6 +202,9 @@ program
     .description('Run a workflow')
     .option('-i, --input <key=value...>', 'Input parameters')
     .option('-v, --verbose', 'Verbose output')
+    .option('-d, --debug', 'Debug mode with detailed output (includes stack traces)')
+    .option('-a, --agent <provider>', 'AI agent provider (claude-code, claude-agent, github-copilot, opencode, ollama, codex)')
+    .option('-m, --model <name>', 'Model name to use (e.g., claude-sonnet-4, gpt-4, etc.)')
     .option('--dry-run', 'Parse workflow without executing')
     .action(async (workflowPath, options) => {
     const spinner = ora('Loading workflow...').start();
@@ -178,12 +229,56 @@ program
         else {
             spinner.succeed(`Loaded: ${workflow.metadata.name}`);
         }
+        // Debug: Show workflow details
+        if (options.debug) {
+            console.log(chalk.gray('\n🐛 Debug: Workflow Details'));
+            console.log(chalk.gray(`  ID: ${workflow.metadata.id}`));
+            console.log(chalk.gray(`  Version: ${workflow.metadata.version}`));
+            console.log(chalk.gray(`  Steps: ${workflow.steps.length}`));
+            console.log(chalk.gray(`  Tools: ${Object.keys(workflow.tools).join(', ') || 'none'}`));
+            console.log(chalk.gray(`  Inputs Required: ${Object.keys(workflow.inputs || {}).join(', ') || 'none'}`));
+        }
         // Parse inputs
-        const inputs = {};
-        if (options.input) {
-            for (const pair of options.input) {
-                const [key, value] = pair.split('=');
-                inputs[key] = value;
+        const parsedInputs = parseInputPairs(options.input);
+        // Debug: Show parsed inputs
+        if (options.debug) {
+            debugLogInputs(parsedInputs);
+        }
+        // Validate required inputs and apply defaults
+        const validation = validateAndApplyDefaults(workflow, parsedInputs, { debug: options.debug });
+        if (!validation.valid) {
+            spinner.fail('Missing required inputs');
+            printMissingInputsError(workflow, validation.missingInputs, 'run', workflowPath);
+            process.exit(1);
+        }
+        const inputs = validation.inputs;
+        // Override AI agent if specified
+        if (options.agent) {
+            const sdkName = getAgentSDKName(options.agent);
+            const authConfig = getAgentAuthConfig(sdkName);
+            const result = overrideAgentInWorkflow(workflow, sdkName, authConfig, {
+                verbose: options.verbose,
+                debug: options.debug,
+            });
+            if (options.debug) {
+                debugLogAgentOverride(options.agent, sdkName, result.replacedCount, authConfig);
+            }
+        }
+        // Override model if specified
+        if (options.model) {
+            const result = overrideModelInWorkflow(workflow, options.model);
+            if (options.verbose || options.debug) {
+                if (result.overrideCount > 0) {
+                    console.log(chalk.cyan(`  Set model '${options.model}' for ${result.overrideCount} AI tool(s)`));
+                }
+            }
+            if (options.debug) {
+                console.log(chalk.gray('\n🐛 Debug: Model Override'));
+                console.log(chalk.gray(`  Model: ${options.model}`));
+                console.log(chalk.gray(`  Applied to ${result.overrideCount} AI tool(s)`));
+            }
+            if (result.overrideCount === 0 && (options.verbose || options.debug)) {
+                console.log(chalk.yellow(`  Warning: --model specified but no AI tools found in workflow`));
             }
         }
         // Handle dry-run mode
@@ -202,28 +297,166 @@ program
         }
         // Execute workflow
         spinner.start('Executing workflow...');
+        // Debug: Show execution start
+        if (options.debug) {
+            console.log(chalk.gray('\n🐛 Debug: Starting Workflow Execution'));
+            console.log(chalk.gray(`  Workflow: ${workflow.metadata.name}`));
+            console.log(chalk.gray(`  Steps to execute: ${workflow.steps.length}`));
+        }
+        // Track which steps we've logged to avoid duplicate output on retries
+        const loggedSteps = new Set();
         const engine = new WorkflowEngine({}, {
             onStepStart: (step) => {
-                if (options.verbose) {
+                if (options.verbose || options.debug) {
                     spinner.text = `Executing: ${step.id}`;
                 }
+                // Only log step start once (not on retries)
+                if (options.debug && !loggedSteps.has(step.id)) {
+                    console.log(chalk.gray(`\n🐛 Debug: Step Start - ${step.id}`));
+                    console.log(chalk.gray(`  Action: ${step.action || 'N/A'}`));
+                    if (step.inputs) {
+                        console.log(chalk.gray(`  Inputs: ${JSON.stringify(step.inputs, null, 2).split('\n').join('\n  ')}`));
+                    }
+                    loggedSteps.add(step.id);
+                }
             },
             onStepComplete: (step, result) => {
-                if (options.verbose) {
+                if (options.verbose || options.debug) {
                     const icon = result.status === StepStatus.COMPLETED ? '✓' : '✗';
                     console.log(`  ${icon} ${step.id}: ${result.status}`);
                 }
+                if (options.debug) {
+                    console.log(chalk.gray(`\n🐛 Debug: Step Complete - ${step.id}`));
+                    console.log(chalk.gray(`  Status: ${result.status}`));
+                    console.log(chalk.gray(`  Duration: ${result.duration}ms`));
+                    // Show output variable name if set
+                    if (step.outputVariable) {
+                        console.log(chalk.gray(`  Output Variable: ${step.outputVariable}`));
+                    }
+                    // Show full output in debug mode (not truncated)
+                    if (result.output !== undefined) {
+                        let outputStr;
+                        if (typeof result.output === 'string') {
+                            outputStr = result.output;
+                        }
+                        else {
+                            outputStr = JSON.stringify(result.output, null, 2);
+                        }
+                        // Split into lines and indent each line
+                        const lines = outputStr.split('\n');
+                        if (lines.length > 50) {
+                            // If output is very large (>50 lines), show first 40 and last 5 lines
+                            console.log(chalk.gray(`  Output (${lines.length} lines):`));
+                            lines.slice(0, 40).forEach(line => console.log(chalk.gray(`    ${line}`)));
+                            console.log(chalk.gray(`    ... (${lines.length - 45} lines omitted) ...`));
+                            lines.slice(-5).forEach(line => console.log(chalk.gray(`    ${line}`)));
+                        }
+                        else {
+                            console.log(chalk.gray(`  Output:`));
+                            lines.forEach(line => console.log(chalk.gray(`    ${line}`)));
+                        }
+                    }
+                    if (result.error) {
+                        console.log(chalk.red(`  Error: ${result.error}`));
+                    }
+                }
             },
         });
         const registry = new SDKRegistry();
         registerIntegrations(registry);
         registry.registerTools(workflow.tools);
+        // Debug: Show registered tools
+        if (options.debug) {
+            console.log(chalk.gray('\n🐛 Debug: SDK Registry'));
+            console.log(chalk.gray(`  Registered tools: ${Object.keys(workflow.tools).join(', ')}`));
+        }
         const result = await engine.execute(workflow, inputs, registry, createSDKStepExecutor());
         if (result.status === WorkflowStatus.COMPLETED) {
             spinner.succeed(`Workflow completed in ${result.duration}ms`);
         }
         else {
             spinner.fail(`Workflow failed: ${result.error}`);
+            // Debug: Show detailed error information
+            if (options.debug) {
+                console.log(chalk.red('\n🐛 Debug: Failure Details'));
+                console.log(chalk.red(`  Error: ${result.error}`));
+                // Find the failed step
+                const failedStep = result.stepResults.find(s => s.status === StepStatus.FAILED);
+                if (failedStep) {
+                    console.log(chalk.red(`  Failed Step: ${failedStep.stepId}`));
+                    console.log(chalk.red(`  Step Duration: ${failedStep.duration}ms`));
+                    if (failedStep.error) {
+                        console.log(chalk.red(`  Step Error: ${failedStep.error}`));
+                        // Extract detailed error information
+                        const errorObj = typeof failedStep.error === 'object' ? failedStep.error : null;
+                        if (errorObj) {
+                            // HTTP error details (Axios, fetch, etc.)
+                            if (errorObj.response) {
+                                console.log(chalk.red('\n  HTTP Error Details:'));
+                                console.log(chalk.red(`    Status: ${errorObj.response.status} ${errorObj.response.statusText || ''}`));
+                                if (errorObj.config?.url) {
+                                    console.log(chalk.red(`    URL: ${errorObj.config.method?.toUpperCase() || 'GET'} ${errorObj.config.url}`));
+                                }
+                                if (errorObj.response.data) {
+                                    console.log(chalk.red(`    Response Body:`));
+                                    try {
+                                        const responseStr = typeof errorObj.response.data === 'string'
+                                            ? errorObj.response.data
+                                            : JSON.stringify(errorObj.response.data, null, 2);
+                                        const lines = responseStr.split('\n').slice(0, 20); // First 20 lines
+                                        lines.forEach((line) => console.log(chalk.red(`      ${line}`)));
+                                        if (responseStr.split('\n').length > 20) {
+                                            console.log(chalk.red(`      ... (truncated)`));
+                                        }
+                                    }
+                                    catch {
+                                        console.log(chalk.red(`      [Unable to serialize response]`));
+                                    }
+                                }
+                                if (errorObj.response.headers) {
+                                    console.log(chalk.red(`    Response Headers:`));
+                                    const headers = errorObj.response.headers;
+                                    Object.keys(headers).slice(0, 10).forEach((key) => {
+                                        console.log(chalk.red(`      ${key}: ${headers[key]}`));
+                                    });
+                                }
+                            }
+                            // Request details
+                            if (errorObj.config && !errorObj.response) {
+                                console.log(chalk.red('\n  Request Details:'));
+                                if (errorObj.config.url) {
+                                    console.log(chalk.red(`    URL: ${errorObj.config.method?.toUpperCase() || 'GET'} ${errorObj.config.url}`));
+                                }
+                                if (errorObj.config.baseURL) {
+                                    console.log(chalk.red(`    Base URL: ${errorObj.config.baseURL}`));
+                                }
+                                if (errorObj.code) {
+                                    console.log(chalk.red(`    Error Code: ${errorObj.code}`));
+                                }
+                            }
+                            // Stack trace
+                            if (errorObj.stack) {
+                                console.log(chalk.red('\n  Stack Trace:'));
+                                const stack = errorObj.stack.split('\n').slice(0, 15); // First 15 lines
+                                stack.forEach((line) => console.log(chalk.red(`    ${line}`)));
+                                if (errorObj.stack.split('\n').length > 15) {
+                                    console.log(chalk.red(`    ... (truncated)`));
+                                }
+                            }
+                        }
+                    }
+                    if (failedStep.output) {
+                        console.log(chalk.red(`  Output: ${JSON.stringify(failedStep.output, null, 2)}`));
+                    }
+                }
+                // Show context from previous steps
+                console.log(chalk.yellow('\n🐛 Debug: Execution Context'));
+                console.log(chalk.yellow(`  Total steps executed: ${result.stepResults.length}`));
+                console.log(chalk.yellow(`  Steps before failure:`));
+                result.stepResults.slice(0, -1).forEach(stepResult => {
+                    console.log(chalk.yellow(`    - ${stepResult.stepId}: ${stepResult.status}`));
+                });
+            }
             process.exit(1);
         }
         // Show summary
@@ -235,9 +468,39 @@ program
         const failed = result.stepResults.filter((s) => s.status === StepStatus.FAILED).length;
         const skipped = result.stepResults.filter((s) => s.status === StepStatus.SKIPPED).length;
         console.log(`  Completed: ${completed}, Failed: ${failed}, Skipped: ${skipped}`);
+        // Exit successfully to avoid hanging due to open SDK connections
+        process.exit(0);
     }
     catch (error) {
         spinner.fail(`Execution failed: ${error}`);
+        // Debug: Show full error details with stack trace
+        if (options.debug) {
+            console.log(chalk.red('\n🐛 Debug: Unhandled Error Details'));
+            console.log(chalk.red(`  Error Type: ${error instanceof Error ? error.constructor.name : typeof error}`));
+            console.log(chalk.red(`  Error Message: ${error instanceof Error ? error.message : String(error)}`));
+            if (error instanceof Error && error.stack) {
+                console.log(chalk.red('\n  Stack Trace:'));
+                error.stack.split('\n').forEach(line => {
+                    console.log(chalk.red(`    ${line}`));
+                });
+            }
+            // Show error properties if available
+            if (error && typeof error === 'object') {
+                const errorObj = error;
+                const keys = Object.keys(errorObj).filter(k => k !== 'stack' && k !== 'message');
+                if (keys.length > 0) {
+                    console.log(chalk.red('\n  Additional Error Properties:'));
+                    keys.forEach(key => {
+                        try {
+                            console.log(chalk.red(`    ${key}: ${JSON.stringify(errorObj[key], null, 2)}`));
+                        }
+                        catch {
+                            console.log(chalk.red(`    ${key}: [Unable to serialize]`));
+                        }
+                    });
+                }
+            }
+        }
         process.exit(1);
     }
 });
@@ -247,6 +510,8 @@ program
     .description('Debug a workflow with step-by-step execution')
     .option('-i, --input <key=value...>', 'Input parameters')
     .option('-b, --breakpoint <stepId...>', 'Set breakpoints at step IDs')
+    .option('-a, --agent <provider>', 'AI agent provider (claude-code, claude-agent, github-copilot, opencode, ollama, codex)')
+    .option('-m, --model <name>', 'Model name to use (e.g., claude-sonnet-4, gpt-4, etc.)')
     .option('--auto-start', 'Start without initial prompt')
     .action(async (workflowPath, options) => {
     const spinner = ora('Loading workflow for debugging...').start();
@@ -271,13 +536,24 @@ program
         else {
             spinner.succeed(`Loaded: ${workflow.metadata.name}`);
         }
-        // Parse inputs
-        const inputs = {};
-        if (options.input) {
-            for (const pair of options.input) {
-                const [key, value] = pair.split('=');
-                inputs[key] = value;
-            }
+        // Parse and validate inputs
+        const parsedInputs = parseInputPairs(options.input);
+        const validation = validateAndApplyDefaults(workflow, parsedInputs);
+        if (!validation.valid) {
+            spinner.fail('Missing required inputs');
+            printMissingInputsError(workflow, validation.missingInputs, 'debug', workflowPath);
+            process.exit(1);
+        }
+        const inputs = validation.inputs;
+        // Override AI agent if specified
+        if (options.agent) {
+            const sdkName = getAgentSDKName(options.agent);
+            const authConfig = getAgentAuthConfig(sdkName);
+            overrideAgentInWorkflow(workflow, sdkName, authConfig);
+        }
+        // Override model if specified
+        if (options.model) {
+            overrideModelInWorkflow(workflow, options.model);
         }
         // Parse breakpoints
         const breakpoints = options.breakpoint ? parseBreakpoints(options.breakpoint) : [];
@@ -496,13 +772,14 @@ bundleCmd
     }
     const bundle = new WorkflowBundle(path);
     const workflow = await bundle.loadWorkflowWithBundleTools();
-    const inputs = {};
-    if (options.input) {
-        for (const pair of options.input) {
-            const [key, value] = pair.split('=');
-            inputs[key] = value;
-        }
+    // Parse and validate inputs
+    const parsedInputs = parseInputPairs(options.input);
+    const validation = validateAndApplyDefaults(workflow, parsedInputs);
+    if (!validation.valid) {
+        printMissingInputsError(workflow, validation.missingInputs, 'bundle run', path);
+        process.exit(1);
     }
+    const inputs = validation.inputs;
     const engine = new WorkflowEngine();
     const registry = new SDKRegistry();
     registerIntegrations(registry);
@@ -534,6 +811,7 @@ program
     .option('--client-id <id>', 'OAuth client ID')
     .option('--client-secret <secret>', 'OAuth client secret')
     .option('--tenant-id <tenant>', 'Microsoft tenant ID (for Outlook)')
+    .option('--port <port>', 'Port for OAuth callback server (default: 8484)', '8484')
     .action(async (service, options) => {
     const serviceLower = service.toLowerCase();
     console.log(chalk.bold(`Connecting ${service}...`));
@@ -541,6 +819,7 @@ program
     if (serviceLower === 'gmail') {
         const clientId = options.clientId ?? process.env.GOOGLE_CLIENT_ID;
         const clientSecret = options.clientSecret ?? process.env.GOOGLE_CLIENT_SECRET;
+        const port = parseInt(options.port, 10);
         if (!clientId || !clientSecret) {
             console.log(chalk.yellow('\nGmail OAuth requires client credentials.'));
             console.log('\nTo connect Gmail:');
@@ -554,7 +833,7 @@ program
         }
         try {
             const { runGmailOAuth } = await import('./oauth.js');
-            const tokens = await runGmailOAuth({ clientId, clientSecret });
+            const tokens = await runGmailOAuth({ clientId, clientSecret, port });
             console.log(chalk.green('\nGmail connected successfully!'));
             console.log(chalk.dim(`Access token expires: ${tokens.expires_at ? new Date(tokens.expires_at).toISOString() : 'unknown'}`));
             console.log('\nYou can now use Gmail in your workflows:');
@@ -564,25 +843,77 @@ program
       auth:
         client_id: "\${GOOGLE_CLIENT_ID}"
         client_secret: "\${GOOGLE_CLIENT_SECRET}"
-        redirect_uri: "http://localhost:8484/callback"
+        redirect_uri: "http://localhost:${port}/callback"
         refresh_token: "\${GMAIL_REFRESH_TOKEN}"`));
+            process.exit(0);
+        }
+        catch (error) {
+            console.log(chalk.red(`\nOAuth failed: ${error}`));
+            process.exit(1);
+        }
+    }
+    // Handle other Google services (Drive, Sheets, Calendar, Docs, Workspace)
+    if (serviceLower === 'google-drive' ||
+        serviceLower === 'drive' ||
+        serviceLower === 'google-sheets' ||
+        serviceLower === 'sheets' ||
+        serviceLower === 'google-calendar' ||
+        serviceLower === 'calendar' ||
+        serviceLower === 'google-docs' ||
+        serviceLower === 'docs' ||
+        serviceLower === 'google-workspace' ||
+        serviceLower === 'workspace') {
+        const clientId = options.clientId ?? process.env.GOOGLE_CLIENT_ID;
+        const clientSecret = options.clientSecret ?? process.env.GOOGLE_CLIENT_SECRET;
+        const port = parseInt(options.port, 10);
+        if (!clientId || !clientSecret) {
+            console.log(chalk.yellow('\nGoogle OAuth requires client credentials.'));
+            console.log('\nTo connect Google services:');
+            console.log('  1. Go to https://console.cloud.google.com/');
+            console.log('  2. Enable the API for your service (Drive, Sheets, etc.)');
+            console.log('  3. Create OAuth 2.0 credentials (Desktop app type)');
+            console.log(`  4. Run: marktoflow connect ${service} --client-id YOUR_ID --client-secret YOUR_SECRET`);
+            console.log('\nOr set environment variables:');
+            console.log('  export GOOGLE_CLIENT_ID="your-client-id"');
+            console.log('  export GOOGLE_CLIENT_SECRET="your-client-secret"');
+            return;
+        }
+        try {
+            const { runGoogleOAuth } = await import('./oauth.js');
+            const tokens = await runGoogleOAuth(serviceLower, { clientId, clientSecret, port });
+            console.log(chalk.dim(`Access token expires: ${tokens.expires_at ? new Date(tokens.expires_at).toISOString() : 'unknown'}`));
+            // Normalize service name for display
+            const normalizedService = serviceLower.startsWith('google-')
+                ? serviceLower
+                : `google-${serviceLower}`;
+            console.log('\nYou can now use this service in your workflows:');
+            console.log(chalk.cyan(`  tools:
+    ${serviceLower.replace('google-', '')}:
+      sdk: "${normalizedService}"
+      auth:
+        client_id: "\${GOOGLE_CLIENT_ID}"
+        client_secret: "\${GOOGLE_CLIENT_SECRET}"
+        redirect_uri: "http://localhost:${port}/callback"
+        refresh_token: "\${GOOGLE_REFRESH_TOKEN}"
+        access_token: "\${GOOGLE_ACCESS_TOKEN}"`));
+            process.exit(0);
         }
         catch (error) {
             console.log(chalk.red(`\nOAuth failed: ${error}`));
             process.exit(1);
         }
-        return;
     }
     if (serviceLower === 'outlook' || serviceLower === 'microsoft') {
         const clientId = options.clientId ?? process.env.MICROSOFT_CLIENT_ID;
         const clientSecret = options.clientSecret ?? process.env.MICROSOFT_CLIENT_SECRET;
         const tenantId = options.tenantId ?? process.env.MICROSOFT_TENANT_ID;
+        const port = parseInt(options.port, 10);
         if (!clientId) {
             console.log(chalk.yellow('\nOutlook OAuth requires a client ID.'));
             console.log('\nTo connect Outlook/Microsoft Graph:');
             console.log('  1. Go to https://portal.azure.com/');
             console.log('  2. Register an application in Azure AD');
-            console.log('  3. Add redirect URI: http://localhost:8484/callback');
+            console.log(`  3. Add redirect URI: http://localhost:${port}/callback`);
             console.log('  4. Grant Mail.Read, Mail.Send, Calendars.ReadWrite permissions');
             console.log('  5. Run: marktoflow connect outlook --client-id YOUR_ID');
             console.log('\nOr set environment variables:');
@@ -593,7 +924,7 @@ program
         }
         try {
             const { runOutlookOAuth } = await import('./oauth.js');
-            const tokens = await runOutlookOAuth({ clientId, clientSecret, tenantId });
+            const tokens = await runOutlookOAuth({ clientId, clientSecret, tenantId, port });
             console.log(chalk.green('\nOutlook connected successfully!'));
             console.log(chalk.dim(`Access token expires: ${tokens.expires_at ? new Date(tokens.expires_at).toISOString() : 'unknown'}`));
             console.log('\nYou can now use Outlook in your workflows:');
@@ -602,12 +933,12 @@ program
       sdk: "@microsoft/microsoft-graph-client"
       auth:
         token: "\${OUTLOOK_ACCESS_TOKEN}"`));
+            process.exit(0);
         }
         catch (error) {
             console.log(chalk.red(`\nOAuth failed: ${error}`));
             process.exit(1);
         }
-        return;
     }
     // Other services - show manual setup instructions
     console.log('\nManual setup required. Set environment variables:');
@@ -663,6 +994,7 @@ program
             console.log('\n' + chalk.bold('Available services:'));
             console.log('  Communication: slack, discord');
             console.log('  Email: gmail, outlook');
+            console.log('  Google Workspace: google-drive, google-sheets, google-calendar, google-docs, google-workspace');
             console.log('  Project management: jira, linear');
             console.log('  Documentation: notion, confluence');
             console.log('  Developer: github');