@xortex/xcode 3.0.1 → 3.0.2

package/assistant/sessionHistory.ts

@@ -0,0 +1,87 @@
+import axios from 'src/utils/axios.js'
+import { getOauthConfig } from '../constants/oauth.js'
+import type { SDKMessage } from '../entrypoints/agentSdkTypes.js'
+import { logForDebugging } from '../utils/debug.js'
+import { getOAuthHeaders, prepareApiRequest } from '../utils/teleport/api.js'
+
+export const HISTORY_PAGE_SIZE = 100
+
+export type HistoryPage = {
+  /** Chronological order within the page. */
+  events: SDKMessage[]
+  /** Oldest event ID in this page → before_id cursor for next-older page. */
+  firstId: string | null
+  /** true = older events exist. */
+  hasMore: boolean
+}
+
+type SessionEventsResponse = {
+  data: SDKMessage[]
+  has_more: boolean
+  first_id: string | null
+  last_id: string | null
+}
+
+export type HistoryAuthCtx = {
+  baseUrl: string
+  headers: Record<string, string>
+}
+
+/** Prepare auth + headers + base URL once, reuse across pages. */
+export async function createHistoryAuthCtx(
+  sessionId: string,
+): Promise<HistoryAuthCtx> {
+  const { accessToken, orgUUID } = await prepareApiRequest()
+  return {
+    baseUrl: `${getOauthConfig().BASE_API_URL}/v1/sessions/${sessionId}/events`,
+    headers: {
+      ...getOAuthHeaders(accessToken),
+      'anthropic-beta': 'ccr-byoc-2025-07-29',
+      'x-organization-uuid': orgUUID,
+    },
+  }
+}
+
+async function fetchPage(
+  ctx: HistoryAuthCtx,
+  params: Record<string, string | number | boolean>,
+  label: string,
+): Promise<HistoryPage | null> {
+  const resp = await axios
+    .get<SessionEventsResponse>(ctx.baseUrl, {
+      headers: ctx.headers,
+      params,
+      timeout: 15000,
+      validateStatus: () => true,
+    })
+    .catch(() => null)
+  if (!resp || resp.status !== 200) {
+    logForDebugging(`[${label}] HTTP ${resp?.status ?? 'error'}`)
+    return null
+  }
+  return {
+    events: Array.isArray(resp.data.data) ? resp.data.data : [],
+    firstId: resp.data.first_id,
+    hasMore: resp.data.has_more,
+  }
+}
+
+/**
+ * Newest page: last `limit` events, chronological, via anchor_to_latest.
+ * has_more=true means older events exist.
+ */
+export async function fetchLatestEvents(
+  ctx: HistoryAuthCtx,
+  limit = HISTORY_PAGE_SIZE,
+): Promise<HistoryPage | null> {
+  return fetchPage(ctx, { limit, anchor_to_latest: true }, 'fetchLatestEvents')
+}
+
+/** Older page: events immediately before `beforeId` cursor. */
+export async function fetchOlderEvents(
+  ctx: HistoryAuthCtx,
+  beforeId: string,
+  limit = HISTORY_PAGE_SIZE,
+): Promise<HistoryPage | null> {
+  return fetchPage(ctx, { limit, before_id: beforeId }, 'fetchOlderEvents')
+}

package/bin/xcode

@@ -7,7 +7,7 @@
  * - Or use the curl installer
  */
 
-const { execSync } = require('child_process');
+const { spawn } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
@@ -18,22 +18,19 @@ const mainScript = path.join(projectRoot, 'entrypoints', 'cli.tsx');
 // Check if bun is available
 function getRuntime() {
   try {
-    execSync('bun --version', { stdio: 'ignore' });
+    require('child_process').execSync('bun --version', { stdio: 'ignore' });
     return 'bun';
   } catch {
     try {
-      execSync('node --version', { stdio: 'ignore' });
-      // Check if tsx is available for Node
-      execSync('npx tsx --version', { stdio: 'ignore' });
+      require('child_process').execSync('node --version', { stdio: 'ignore' });
       return 'node';
     } catch {
-      console.error('❌ Error: Neither Bun nor Node.js with tsx is installed.');
+      console.error('❌ Error: Neither Bun nor Node.js is installed.');
       console.error('');
       console.error('Please install one of the following:');
       console.error('  • Bun (recommended): curl -fsSL https://bun.sh/install | bash');
-      console.error('  • Node.js + tsx: npm install -g tsx');
+      console.error('  • Node.js: https://nodejs.org/');
       console.error('');
-      console.error('Then try running xcode again.');
       process.exit(1);
     }
   }
@@ -48,8 +45,7 @@ const args = process.argv.slice(2);
 const command = args[0];
 
 if (command === '--version' || command === '-v') {
-  const pkg = JSON.parse(fs.readFileSync(path.join(projectRoot, 'package.json'), 'utf8'));
-  console.log(`xcode v${pkg.version}`);
+  console.log('xcode v3.0.1 — AI coding assistant with XMem memory');
   process.exit(0);
 }
 
@@ -63,25 +59,19 @@ Options:
   -v, --version     Show version number
   -h, --help        Show help
   --model <model>   Start with specific model (e.g., gemini-2.5-pro, kimi-k2.5)
-  --openrouter      Use OpenRouter for model access
 
 Commands:
   (none)            Start interactive session
-  --model gemini-2.5-pro    Use Gemini 2.5 Pro via OpenRouter
-  --model kimi-k2.5         Use Kimi K2.5 via OpenRouter  
-  --model deepseek-v3.2     Use DeepSeek V3.2 via OpenRouter
 
 Environment Variables:
-  OPENROUTER_API_KEY      OpenRouter API key (for non-Anthropic models)
+  OPENROUTER_API_KEY      OpenRouter API key (optional, has default)
   XMEM_API_URL           XMem memory server URL (default: http://localhost:8000)
-  XMEM_API_KEY           XMem memory API key
   ANTHROPIC_API_KEY      Anthropic API key (for Claude models)
-  GEMINI_API_KEY         Gemini API key (for Google models)
 
 Examples:
   xcode                                    # Start with default model
   xcode --model gemini-2.5-pro            # Use Gemini via OpenRouter
-  OPENROUTER_API_KEY=xxx xcode --model kimi-k2.5   # Use specific API key
+  xcode --model kimi-k2.5                 # Use Kimi via OpenRouter
 `);
   process.exit(0);
 }
@@ -107,21 +97,63 @@ if (args.includes('--openrouter')) {
 // Run the main application
 const runtime = getRuntime();
 
-try {
-  if (runtime === 'bun') {
-    execSync(`bun run "${mainScript}"`, {
+if (runtime === 'bun') {
+  // Use Bun - it handles TypeScript natively
+  const child = spawn('bun', ['run', mainScript, ...args], {
+    cwd: projectRoot,
+    stdio: 'inherit',
+    env: process.env,
+  });
+  
+  child.on('exit', (code) => {
+    process.exit(code || 0);
+  });
+} else {
+  // Use Node with ts-node or tsx
+  // First check if tsx is installed globally or locally
+  let tsxPath;
+  try {
+    // Try local tsx first
+    tsxPath = require.resolve('tsx/dist/cli.mjs', { paths: [projectRoot] });
+  } catch {
+    try {
+      // Try global tsx
+      tsxPath = require.resolve('tsx/dist/cli.mjs');
+    } catch {
+      // Fallback to npx tsx
+      tsxPath = null;
+    }
+  }
+  
+  let child;
+  if (tsxPath) {
+    // Use direct tsx path
+    child = spawn('node', [tsxPath, mainScript, ...args], {
       cwd: projectRoot,
       stdio: 'inherit',
       env: process.env,
     });
   } else {
-    execSync(`npx tsx "${mainScript}"`, {
+    // Fallback to npx
+    child = spawn('npx', ['tsx', mainScript, ...args], {
       cwd: projectRoot,
       stdio: 'inherit',
       env: process.env,
     });
   }
-} catch (error) {
-  // Exit with the same code as the child process
-  process.exit(error.status || 1);
+  
+  child.on('exit', (code) => {
+    process.exit(code || 0);
+  });
+  
+  child.on('error', (err) => {
+    console.error('❌ Failed to start XCode:', err.message);
+    console.error('');
+    console.error('Please ensure tsx is installed:');
+    console.error('  npm install -g tsx');
+    console.error('');
+    console.error('Or use Bun instead:');
+    console.error('  curl -fsSL https://bun.sh/install | bash');
+    process.exit(1);
+  });
 }