@continuedev/continuous-ai 1.0.1 → 1.0.3

package/README.md

@@ -87,7 +87,7 @@ cai approve https://github.com/owner/repo/pull/123 --merge
 Options:
 - `--org <slug>` - Organization context
 - `--token <key>` - API key
-- `--merge` - Also merge the PR (default: just mark ready)
+- `--merge` - Also merge the PR (default: just mark as ready)
 - `--merge-method squash|merge|rebase` - Merge method (default: squash)
 
 #### `cai reject <pr-url>`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@continuedev/continuous-ai",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "CLI tool for interacting with Continue agent checks on pull requests",
   "type": "module",
   "bin": {

package/src/commands/accept.js

@@ -0,0 +1,62 @@
+import chalk from 'chalk';
+import { execSync } from 'child_process';
+import { getApiKey, getApiUrl, requireApiKey } from '../lib/auth.js';
+import { ApiClient } from '../lib/api-client.js';
+import { createSpinner } from '../lib/formatters.js';
+
+export function acceptCommand(program) {
+  program
+    .command('accept <session-id>')
+    .description('Accept agent changes (pushes to GitHub, or use --local to apply locally)')
+    .option('--token <key>', 'API key')
+    .option('--local', 'Apply diff locally instead of pushing to GitHub', false)
+    .action(async (sessionId, options) => {
+      const spinner = createSpinner(
+        options.local ? 'Accepting changes locally...' : 'Accepting and pushing to GitHub...'
+      );
+      try {
+        const apiKey = getApiKey(options.token);
+        requireApiKey(apiKey);
+
+        const client = new ApiClient(getApiUrl(), apiKey);
+        spinner.start();
+
+        if (options.local) {
+          // Fetch diff first
+          const diffResult = await client.getSessionDiff(sessionId);
+          const diff = diffResult.diff || diffResult;
+
+          if (!diff || diff.trim() === '') {
+            spinner.stop();
+            console.log(chalk.yellow('No changes to apply'));
+            return;
+          }
+
+          // Mark as accepted in backend
+          await client.acceptCommitLocal(sessionId);
+
+          // Apply diff locally
+          try {
+            execSync('git apply', { input: diff, stdio: ['pipe', 'pipe', 'pipe'] });
+            spinner.stop();
+            console.log(chalk.green('✓') + ' Changes accepted and applied locally');
+            console.log('  You can now review and commit the changes yourself');
+          } catch (gitError) {
+            spinner.stop();
+            console.log(chalk.yellow('✓') + ' Marked as accepted, but failed to apply diff locally');
+            console.error('  Git error:', gitError.message);
+            process.exit(1);
+          }
+        } else {
+          // Accept and push to GitHub
+          await client.acceptCommit(sessionId);
+          spinner.stop();
+          console.log(chalk.green('✓') + ' Changes accepted and pushed to GitHub');
+        }
+      } catch (error) {
+        spinner.stop();
+        console.error('ERROR:', error.message);
+        process.exit(1);
+      }
+    });
+}

package/src/commands/reject.js

@@ -1,44 +1,26 @@
 import chalk from 'chalk';
 import { getApiKey, getApiUrl, requireApiKey } from '../lib/auth.js';
 import { ApiClient } from '../lib/api-client.js';
-import { parsePrUrl } from '../lib/pr-parser.js';
 import { createSpinner } from '../lib/formatters.js';
 
 export function rejectCommand(program) {
   program
-    .command('reject <pr-url>')
-    .description('Reject changes and close the PR')
-    .option('--org <slug>', 'Organization context')
+    .command('reject <session-id>')
+    .description('Reject agent changes')
     .option('--token <key>', 'API key')
-    .option('--reason <text>', 'Optional rejection reason')
-    .action(async (prUrl, options) => {
-      const spinner = createSpinner('Rejecting pull request...');
+    .action(async (sessionId, options) => {
+      const spinner = createSpinner('Rejecting changes...');
       try {
-        // Get API key
         const apiKey = getApiKey(options.token);
         requireApiKey(apiKey);
 
-        // Parse PR URL
-        const pr = parsePrUrl(prUrl);
-
-        // Create API client
         const client = new ApiClient(getApiUrl(), apiKey);
-
         spinner.start();
 
-        // Reject PR
-        const result = await client.rejectPr(pr.url, {
-          organizationSlug: options.org,
-          reason: options.reason,
-        });
+        await client.rejectCommit(sessionId);
 
         spinner.stop();
-
-        console.log(chalk.red('✗') + ' Pull request rejected and closed.');
-        console.log(`  ${prUrl}`);
-        if (options.reason) {
-          console.log(`  Reason: ${options.reason}`);
-        }
+        console.log(chalk.green('✓') + ' Changes rejected');
       } catch (error) {
         spinner.stop();
         console.error('ERROR:', error.message);

package/src/commands/status.js

@@ -27,7 +27,7 @@ export function statusCommand(program) {
           organizationId: options.org,
         });
 
-        const sessions = result.sessions || [];
+        const sessions = result.agents || [];
 
         // Calculate summary
         const terminalStates = ['completed', 'failed', 'cancelled', 'suspended'];

package/src/index.js

@@ -4,14 +4,14 @@ import { statusCommand } from './commands/status.js';
 import { waitCommand } from './commands/wait.js';
 import { logsCommand } from './commands/logs.js';
 import { diffCommand } from './commands/diff.js';
-import { approveCommand } from './commands/approve.js';
+import { acceptCommand } from './commands/accept.js';
 import { rejectCommand } from './commands/reject.js';
 
 const program = new Command();
 
 program
   .name('cai')
-  .description('CLI tool for interacting with Continue agent checks on pull requests')
+  .description('CLI tool for interacting with Continue agent sessions')
   .version('0.1.0');
 
 // Register commands
@@ -19,7 +19,7 @@ statusCommand(program);
 waitCommand(program);
 logsCommand(program);
 diffCommand(program);
-approveCommand(program);
+acceptCommand(program);
 rejectCommand(program);
 
 program.parse(process.argv);

package/src/lib/api-client.js

@@ -123,27 +123,23 @@ export class ApiClient {
   }
 
   /**
-   * Approve a PR and optionally merge
+   * Accept agent changes and push to GitHub
    */
-  async approvePr(pullRequestUrl, options = {}) {
-    const { organizationSlug, autoMerge = false, mergeMethod = 'squash' } = options;
-    return this.post('/agents/approve-pr', {
-      pullRequestUrl,
-      organizationSlug,
-      autoMerge,
-      mergeMethod,
-    });
+  async acceptCommit(sessionId) {
+    return this.post(`/agents/${sessionId}/accept`);
   }
 
   /**
-   * Reject a PR (close it)
+   * Accept agent changes for local application (marks as accepted without pushing)
    */
-  async rejectPr(pullRequestUrl, options = {}) {
-    const { organizationSlug, reason } = options;
-    return this.post('/agents/reject-pr', {
-      pullRequestUrl,
-      organizationSlug,
-      reason,
-    });
+  async acceptCommitLocal(sessionId) {
+    return this.post(`/agents/${sessionId}/accept-local`);
+  }
+
+  /**
+   * Reject agent changes
+   */
+  async rejectCommit(sessionId) {
+    return this.post(`/agents/${sessionId}/reject`);
   }
 }

package/src/lib/formatters.js

@@ -20,7 +20,7 @@ export function formatSessionsTable(sessions, summary) {
 
   // Table rows
   for (const session of sessions) {
-    const sessionId = session.shortId || session.id.substring(0, 8);
+    const sessionId = session.id.substring(0, 8);
     const status = formatStatus(session.status);
     const updated = formatRelativeTime(session.updatedAt);
 
@@ -57,6 +57,7 @@ function formatStatus(status) {
     case 'pending':
       return chalk.gray('⏸ Pending');
     case 'suspended':
+      return chalk.gray('⚠ Suspended');
     case 'cancelled':
       return chalk.gray('⚠ Cancelled');
     default:

package/src/commands/approve.js

@@ -1,52 +0,0 @@
-import chalk from 'chalk';
-import { getApiKey, getApiUrl, requireApiKey } from '../lib/auth.js';
-import { ApiClient } from '../lib/api-client.js';
-import { parsePrUrl } from '../lib/pr-parser.js';
-import { createSpinner } from '../lib/formatters.js';
-
-export function approveCommand(program) {
-  program
-    .command('approve <pr-url>')
-    .description('Approve changes and optionally merge the PR')
-    .option('--org <slug>', 'Organization context')
-    .option('--token <key>', 'API key')
-    .option('--merge', 'Also merge the PR', false)
-    .option('--merge-method <method>', 'Merge method (squash|merge|rebase)', 'squash')
-    .action(async (prUrl, options) => {
-      const spinner = createSpinner('Approving pull request...');
-      try {
-        // Get API key
-        const apiKey = getApiKey(options.token);
-        requireApiKey(apiKey);
-
-        // Parse PR URL
-        const pr = parsePrUrl(prUrl);
-
-        // Create API client
-        const client = new ApiClient(getApiUrl(), apiKey);
-
-        spinner.start();
-
-        // Approve PR
-        const result = await client.approvePr(pr.url, {
-          organizationSlug: options.org,
-          autoMerge: options.merge,
-          mergeMethod: options.mergeMethod,
-        });
-
-        spinner.stop();
-
-        if (result.merged) {
-          console.log(chalk.green('✓') + ' Pull request approved and merged!');
-          console.log(`  ${prUrl}`);
-        } else {
-          console.log(chalk.green('✓') + ' Pull request marked as ready for review!');
-          console.log(`  ${prUrl}`);
-        }
-      } catch (error) {
-        spinner.stop();
-        console.error('ERROR:', error.message);
-        process.exit(1);
-      }
-    });
-}