@diff-review-system/drs 1.0.0 → 2.0.0

package/dist/opencode/agent-skill-overlay.js

@@ -0,0 +1,164 @@
+import { mkdir, mkdtemp, readFile, readdir, rm, writeFile } from 'fs/promises';
+import { existsSync } from 'fs';
+import { dirname, join, relative } from 'path';
+import { tmpdir } from 'os';
+import * as yaml from 'yaml';
+import { getDefaultSkills, normalizeAgentConfig } from '../lib/config.js';
+import { builtInAgentPath } from './opencode-paths.js';
+import { loadProjectSkills } from './skill-loader.js';
+const SKILL_FILE_NAME = 'SKILL.md';
+function normalizeSkillList(skills) {
+    if (!Array.isArray(skills)) {
+        return [];
+    }
+    return skills.map(String).filter((skill) => skill.length > 0);
+}
+function resolveConfiguredSkills(skillConfig, agentName) {
+    if (!skillConfig || skillConfig.agents.length === 0) {
+        return [];
+    }
+    const normalizedName = agentName.startsWith('review/') ? agentName.slice(7) : agentName;
+    const entry = skillConfig.agents.find((agent) => agent.name === normalizedName) ??
+        skillConfig.agents.find((agent) => agent.name === agentName);
+    const defaultSkills = normalizeSkillList(skillConfig.defaultSkills);
+    const agentSkills = entry ? normalizeSkillList(entry.skills) : [];
+    const mergedSkills = new Set([...defaultSkills, ...agentSkills]);
+    if (mergedSkills.size === 0) {
+        return [];
+    }
+    return Array.from(mergedSkills);
+}
+function upsertAgentSkills(content, skills) {
+    if (skills.length === 0) {
+        return content;
+    }
+    const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---\n?/);
+    const parsed = frontmatterMatch ? yaml.parse(frontmatterMatch[1]) : {};
+    const frontmatter = parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed : {};
+    // Enable the skill tool and set permissions for configured skills
+    // OpenCode uses on-demand skill loading via the 'skill' tool, not preloaded skills
+    const updatedFrontmatter = {
+        ...frontmatter,
+        tools: {
+            ...(frontmatter.tools || {}),
+            skill: true, // Enable the skill tool
+        },
+        permission: {
+            ...(frontmatter.permission || {}),
+            skill: {
+                // Allow all skills by default - could be made more granular if needed
+                '*': 'allow',
+            },
+        },
+    };
+    const frontmatterText = yaml.stringify(updatedFrontmatter).trimEnd();
+    const newFrontmatter = `---\n${frontmatterText}\n---\n`;
+    if (frontmatterMatch) {
+        return `${newFrontmatter}${content.slice(frontmatterMatch[0].length)}`;
+    }
+    return `${newFrontmatter}\n${content}`;
+}
+async function writeFileWithSkills(sourcePath, targetPath, agentName, skillConfig) {
+    const content = await readFile(sourcePath, 'utf-8');
+    const skills = resolveConfiguredSkills(skillConfig, agentName);
+    const updatedContent = upsertAgentSkills(content, skills);
+    await mkdir(dirname(targetPath), { recursive: true });
+    await writeFile(targetPath, updatedContent);
+}
+async function traverseDirectory(currentPath, fileFilter) {
+    const files = [];
+    if (!existsSync(currentPath)) {
+        return files;
+    }
+    const entries = await readdir(currentPath, { withFileTypes: true });
+    for (const entry of entries) {
+        const fullPath = join(currentPath, entry.name);
+        if (entry.isDirectory()) {
+            files.push(...(await traverseDirectory(fullPath, fileFilter)));
+        }
+        else if (entry.isFile() && fileFilter(entry.name, fullPath)) {
+            files.push(fullPath);
+        }
+    }
+    return files;
+}
+function resolveOverrideAgentName(overrideRoot, filePath) {
+    const relativePath = relative(overrideRoot, filePath).replace(/\\/g, '/');
+    const stripped = relativePath.replace(/\/agent\.md$/, '');
+    return stripped.startsWith('review/') ? stripped : `review/${stripped}`;
+}
+async function copyBuiltInAgents(destinationRoot, skillConfig) {
+    const files = await traverseDirectory(builtInAgentPath, (entry) => entry.endsWith('.md'));
+    const results = await Promise.allSettled(files.map(async (filePath) => {
+        const relativePath = relative(builtInAgentPath, filePath).replace(/\\/g, '/');
+        const agentName = relativePath.replace(/\.md$/, '').replace(/\\/g, '/');
+        const targetPath = join(destinationRoot, relativePath);
+        await writeFileWithSkills(filePath, targetPath, agentName, skillConfig);
+    }));
+    const failures = results.filter((result) => result.status === 'rejected');
+    if (failures.length > 0) {
+        throw new Error(`Failed to prepare ${failures.length} built-in agent(s)`);
+    }
+}
+async function copyOverrideAgents(projectPath, destinationRoot, skillConfig) {
+    const overrideRoot = join(projectPath, '.drs', 'agents');
+    const files = await traverseDirectory(overrideRoot, (entry) => entry === 'agent.md');
+    const results = await Promise.allSettled(files.map(async (filePath) => {
+        const agentName = resolveOverrideAgentName(overrideRoot, filePath);
+        const targetPath = join(destinationRoot, `${agentName}.md`);
+        await writeFileWithSkills(filePath, targetPath, agentName, skillConfig);
+    }));
+    const failures = results.filter((result) => result.status === 'rejected');
+    if (failures.length > 0) {
+        throw new Error(`Failed to prepare ${failures.length} override agent(s)`);
+    }
+}
+async function copyProjectSkills(projectPath, destinationRoot) {
+    const skills = loadProjectSkills(projectPath);
+    const results = await Promise.allSettled(skills.map(async (skill) => {
+        const targetPath = join(destinationRoot, skill.name, SKILL_FILE_NAME);
+        const content = await readFile(skill.path, 'utf-8');
+        await mkdir(dirname(targetPath), { recursive: true });
+        await writeFile(targetPath, content);
+    }));
+    const failures = results.filter((result) => result.status === 'rejected');
+    if (failures.length > 0) {
+        throw new Error(`Failed to prepare ${failures.length} skill file(s)`);
+    }
+    return skills;
+}
+export async function createAgentSkillOverlay(projectPath, config) {
+    const normalizedAgents = normalizeAgentConfig(config.review.agents);
+    const defaultSkills = getDefaultSkills(config);
+    const hasSkillConfig = defaultSkills.length > 0 || normalizedAgents.some((agent) => (agent.skills ?? []).length > 0);
+    const skills = loadProjectSkills(projectPath);
+    if (!hasSkillConfig && skills.length === 0) {
+        return null;
+    }
+    const overlayRoot = await mkdtemp(join(tmpdir(), 'drs-opencode-'));
+    const opencodeRoot = join(overlayRoot, '.opencode');
+    const agentRoot = join(opencodeRoot, 'agent');
+    const skillRoot = join(opencodeRoot, 'skills');
+    try {
+        await mkdir(agentRoot, { recursive: true });
+        await mkdir(skillRoot, { recursive: true });
+        const skillConfig = {
+            defaultSkills,
+            agents: normalizedAgents,
+        };
+        await copyBuiltInAgents(agentRoot, skillConfig);
+        await copyOverrideAgents(projectPath, agentRoot, skillConfig);
+        await copyProjectSkills(projectPath, skillRoot);
+    }
+    catch (error) {
+        await rm(overlayRoot, { recursive: true, force: true });
+        throw error;
+    }
+    return {
+        root: overlayRoot,
+        cleanup: async () => {
+            await rm(overlayRoot, { recursive: true, force: true });
+        },
+    };
+}
+//# sourceMappingURL=agent-skill-overlay.js.map

package/dist/opencode/agent-skill-overlay.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-skill-overlay.js","sourceRoot":"","sources":["../../src/opencode/agent-skill-overlay.ts"],"names":[],"mappings":"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"}

package/dist/opencode/client.d.ts

@@ -5,16 +5,19 @@
  * 1. Connect to an existing remote OpenCode server (when baseUrl is provided)
  * 2. Start an OpenCode server in-process (when baseUrl is not provided)
  */
+import type { CustomProvider, DRSConfig } from '../lib/config.js';
 export interface OpencodeConfig {
     baseUrl?: string;
     directory?: string;
-    serverPort?: number;
-    serverHostname?: string;
+    modelOverrides?: Record<string, string>;
+    provider?: Record<string, CustomProvider>;
+    debug?: boolean;
+    config?: DRSConfig;
 }
 export interface SessionCreateOptions {
     agent: string;
     message: string;
-    context?: Record<string, any>;
+    context?: Record<string, unknown>;
 }
 export interface SessionMessage {
     id: string;
@@ -36,17 +39,19 @@ export declare class OpencodeClient {
     private inProcessServer?;
     private client?;
     private config;
+    private overlay?;
+    private projectRootEnv?;
     constructor(config: OpencodeConfig);
     /**
      * Initialize - either connect to remote server or start in-process
      */
     initialize(): Promise<void>;
     /**
-     * Create a new session with an agent
+     * Create a new session with an agent and send initial message
      */
     createSession(options: SessionCreateOptions): Promise<Session>;
     /**
-     * Stream messages from a session
+     * Stream messages from a session (polls until agent completes)
      */
     streamMessages(sessionId: string): AsyncGenerator<SessionMessage>;
     /**
@@ -69,6 +74,10 @@ export declare class OpencodeClient {
      * Get server URL
      */
     getServerUrl(): string;
+    /**
+     * Resolve {env:VAR_NAME} references to actual environment variable values
+     */
+    private resolveEnvReferences;
 }
 /**
  * Create an OpenCode client with the given configuration

package/dist/opencode/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/opencode/client.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,QAAQ,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,IAAI,CAAC;CACjB;AAED;;GAEG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,eAAe,CAAC,CAA6C;IACrE,OAAO,CAAC,MAAM,CAAC,CAAqC;IACpD,OAAO,CAAC,MAAM,CAAiB;gBAEnB,MAAM,EAAE,cAAc;IAMlC;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgCjC;;OAEG;IACG,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IA2BpE;;OAEG;IACI,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc,CAAC,cAAc,CAAC;IA0BxE;;OAEG;IACG,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAQrE;;OAEG;IACG,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBpE;;OAEG;IACG,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBpD;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAO/B;;OAEG;IACH,YAAY,IAAI,MAAM;CAMvB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,cAAc,CAE3E;AAED;;GAEG;AACH,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,cAAc,CAAC,CAIzB"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/opencode/client.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAIlE,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC1C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,SAAS,CAAC;CACpB;AAID,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,QAAQ,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,IAAI,CAAC;CACjB;AAED;;GAEG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,eAAe,CAAC,CAA6C;IACrE,OAAO,CAAC,MAAM,CAAC,CAAqC;IACpD,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,OAAO,CAAC,CAAsD;IACtE,OAAO,CAAC,cAAc,CAAC,CAAS;gBAEpB,MAAM,EAAE,cAAc;IAMlC;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA8LjC;;OAEG;IACG,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IAmDpE;;OAEG;IACI,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc,CAAC,cAAc,CAAC;IAyExE;;OAEG;IACG,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAQrE;;OAEG;IACG,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBpE;;OAEG;IACG,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBpD;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB/B;;OAEG;IACH,YAAY,IAAI,MAAM;IAOtB;;OAEG;IACH,OAAO,CAAC,oBAAoB;CA8B7B;AAgDD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,cAAc,CAE3E;AAED;;GAEG;AACH,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,cAAc,CAAC,CAIzB"}

package/dist/opencode/client.js

@@ -6,6 +6,10 @@
  * 2. Start an OpenCode server in-process (when baseUrl is not provided)
  */
 import { createOpencode, createOpencodeClient as createSDKClient } from '@opencode-ai/sdk';
+import net from 'net';
+import { getDefaultSkills, normalizeAgentConfig } from '../lib/config.js';
+import { createAgentSkillOverlay } from './agent-skill-overlay.js';
+const SERVER_START_TIMEOUT_MS = 10000;
 /**
  * OpenCode client that can start a server in-process or connect to remote
  */
@@ -15,6 +19,8 @@ export class OpencodeClient {
     inProcessServer;
     client;
     config;
+    overlay;
+    projectRootEnv;
     constructor(config) {
         this.baseUrl = config.baseUrl;
         this.directory = config.directory;
@@ -33,70 +39,261 @@ export class OpencodeClient {
         }
         else {
             // Start server in-process
-            console.log('Starting OpenCode server in-process...');
-            const apiKey = process.env.ANTHROPIC_API_KEY;
-            if (!apiKey) {
-                throw new Error('ANTHROPIC_API_KEY environment variable is required for in-process OpenCode server');
+            // Build OpenCode config programmatically from DRS config
+            const opencodeConfig = {
+                // Tools available to DRS review agents
+                tools: {
+                    Read: true,
+                    Glob: true,
+                    Grep: true,
+                    Bash: true,
+                    write_json_output: true,
+                    Write: false,
+                    Edit: false,
+                },
+            };
+            // Set log level to DEBUG when --debug flag is used
+            // This shows full system prompts, tools, API calls, etc. from OpenCode
+            if (this.config.debug) {
+                opencodeConfig.logLevel = 'DEBUG';
+                console.log('🔍 OpenCode debug logging enabled');
+            }
+            // Add custom provider if configured in DRS config
+            if (this.config.provider && Object.keys(this.config.provider).length > 0) {
+                // Deep clone and resolve environment variable references
+                opencodeConfig.provider = this.resolveEnvReferences(this.config.provider);
+                const providerNames = Object.keys(this.config.provider);
+                console.log(`📦 Custom provider configured: ${providerNames.join(', ')}`);
+            }
+            // Apply model overrides from DRS config
+            if (this.config.modelOverrides && Object.keys(this.config.modelOverrides).length > 0) {
+                const agentConfig = {};
+                console.log('📋 Agent model configuration:');
+                // Merge model overrides into agent configuration
+                for (const [agentName, model] of Object.entries(this.config.modelOverrides)) {
+                    agentConfig[agentName] = { model };
+                    console.log(`  • ${agentName}: ${model}`);
+                }
+                opencodeConfig.agent = agentConfig;
+                console.log('');
+            }
+            if (this.config.config) {
+                const normalizedAgents = normalizeAgentConfig(this.config.config.review.agents);
+                const defaultSkills = getDefaultSkills(this.config.config);
+                const agentSkills = normalizedAgents
+                    .map((agent) => {
+                    const combined = new Set([
+                        ...defaultSkills,
+                        ...(agent.skills ? agent.skills.map(String) : []),
+                    ]);
+                    return {
+                        name: agent.name,
+                        skills: Array.from(combined).filter((skill) => skill.length > 0),
+                    };
+                })
+                    .filter((agent) => agent.skills.length > 0);
+                if (agentSkills.length > 0) {
+                    console.log('🧩 Agent skill configuration:');
+                    for (const agent of agentSkills) {
+                        console.log(`  • review/${agent.name}: ${agent.skills.join(', ')}`);
+                    }
+                    console.log('');
+                }
             }
-            // OpenCode SDK reads ANTHROPIC_API_KEY from environment automatically
+            // Debug: Print final OpenCode config
+            if (this.config.debug) {
+                console.log('🔧 DEBUG: Final OpenCode configuration (after env resolution):');
+                console.log('─'.repeat(50));
+                // Show environment variable status for custom providers
+                if (this.config.provider) {
+                    console.log('\n📍 Environment variable status:');
+                    for (const [providerName, provider] of Object.entries(this.config.provider)) {
+                        const apiKeyConfig = provider.options?.apiKey;
+                        if (apiKeyConfig && typeof apiKeyConfig === 'string') {
+                            const envMatch = apiKeyConfig.match(/^\{env:([^}]+)\}$/);
+                            if (envMatch) {
+                                const envVarName = envMatch[1];
+                                const envValue = process.env[envVarName];
+                                if (envValue) {
+                                    console.log(`  ✓ ${envVarName}: SET (${envValue.substring(0, 8)}...)`);
+                                }
+                                else {
+                                    console.log(`  ✗ ${envVarName}: NOT SET`);
+                                }
+                            }
+                            else {
+                                console.log(`  • ${providerName}: API key is hardcoded (not env var)`);
+                            }
+                        }
+                    }
+                    console.log('');
+                }
+                // Sanitize config to hide API keys
+                const sanitizedConfig = JSON.parse(JSON.stringify(opencodeConfig));
+                if (sanitizedConfig.provider) {
+                    for (const providerName of Object.keys(sanitizedConfig.provider)) {
+                        if (sanitizedConfig.provider[providerName]?.options?.apiKey) {
+                            const apiKey = sanitizedConfig.provider[providerName].options.apiKey;
+                            // Always redact since we've resolved env vars
+                            if (apiKey && apiKey.length > 0) {
+                                sanitizedConfig.provider[providerName].options.apiKey =
+                                    `***REDACTED (${apiKey.length} chars)***`;
+                            }
+                            else {
+                                sanitizedConfig.provider[providerName].options.apiKey = '***EMPTY***';
+                            }
+                        }
+                    }
+                }
+                console.log('Config being passed to OpenCode:');
+                console.log(JSON.stringify(sanitizedConfig, null, 2));
+                if (this.config.config) {
+                    const normalizedAgents = normalizeAgentConfig(this.config.config.review.agents);
+                    const defaultSkills = getDefaultSkills(this.config.config);
+                    const agentSkills = normalizedAgents
+                        .map((agent) => {
+                        const combined = new Set([
+                            ...defaultSkills,
+                            ...(agent.skills ? agent.skills.map(String) : []),
+                        ]);
+                        return {
+                            name: `review/${agent.name}`,
+                            skills: Array.from(combined).filter((skill) => skill.length > 0),
+                        };
+                    })
+                        .filter((agent) => agent.skills.length > 0);
+                    if (agentSkills.length > 0) {
+                        console.log('Agent skills (applied via overlay frontmatter):');
+                        console.log(JSON.stringify(agentSkills, null, 2));
+                    }
+                }
+                console.log('─'.repeat(50));
+                console.log('');
+            }
+            // Change to project directory so OpenCode can discover agents
+            const originalCwd = process.cwd();
+            const projectDir = this.directory || originalCwd;
+            this.projectRootEnv = process.env.DRS_PROJECT_ROOT;
+            process.env.DRS_PROJECT_ROOT = projectDir;
+            if (this.config.config) {
+                this.overlay = await createAgentSkillOverlay(projectDir, this.config.config);
+            }
+            const discoveryRoot = this.overlay?.root ?? projectDir;
+            if (discoveryRoot !== originalCwd) {
+                process.chdir(discoveryRoot);
+            }
+            // OpenCode SDK reads provider-specific API keys from environment automatically
+            // (ANTHROPIC_API_KEY, ZHIPU_API_KEY, OPENAI_API_KEY, etc.)
             this.inProcessServer = await createOpencode({
-                hostname: this.config.serverHostname || '127.0.0.1',
-                port: this.config.serverPort || 4096,
-                timeout: 10000,
-                config: {
-                    model: 'anthropic/claude-opus-4-20250514',
-                },
+                timeout: SERVER_START_TIMEOUT_MS,
+                config: opencodeConfig,
             });
+            // Restore original working directory
+            if (discoveryRoot !== originalCwd) {
+                process.chdir(originalCwd);
+            }
             this.client = this.inProcessServer.client;
             this.baseUrl = this.inProcessServer.server.url;
-            console.log(`OpenCode server started at ${this.baseUrl}`);
+            const ready = await waitForServerReady(this.baseUrl);
+            if (!ready) {
+                console.warn(`⚠️  OpenCode server did not become ready at ${this.baseUrl}. Review requests may fail.`);
+            }
         }
     }
     /**
-     * Create a new session with an agent
+     * Create a new session with an agent and send initial message
      */
     async createSession(options) {
         if (!this.client) {
             throw new Error('OpenCode client not initialized. Call initialize() first.');
         }
         try {
-            // Create session using OpenCode SDK
-            // Note: This is a simplified implementation that needs to be adapted to the actual SDK API
-            const response = await this.client.session.create({
+            // Step 1: Create empty session
+            const createResponse = (await this.client.session.create({
+                query: {
+                    directory: this.directory,
+                },
+            }));
+            const sessionId = createResponse.data?.id;
+            if (!sessionId) {
+                throw new Error('Failed to get session ID from create response');
+            }
+            // Step 2: Send initial message to start the agent
+            await this.client.session.prompt({
+                path: { id: sessionId },
+                query: {
+                    directory: this.directory,
+                },
                 body: {
                     agent: options.agent,
-                    userMessage: options.message,
+                    parts: [
+                        {
+                            type: 'text',
+                            text: options.message,
+                        },
+                    ],
                 },
             });
             return {
-                id: response.data?.id || 'session-' + Date.now(),
+                id: sessionId,
                 agent: options.agent,
                 createdAt: new Date(),
             };
         }
         catch (error) {
-            throw new Error(`Failed to create session: ${error instanceof Error ? error.message : String(error)}`);
+            const message = error instanceof Error ? error.message : String(error);
+            const connectionHint = message.includes('fetch failed') || message.includes('ECONNREFUSED')
+                ? ` Check the OpenCode server URL (${this.baseUrl ?? 'in-process'}) and ensure it is reachable.`
+                : '';
+            throw new Error(`Failed to create session: ${message}${connectionHint}`);
         }
     }
     /**
-     * Stream messages from a session
+     * Stream messages from a session (polls until agent completes)
      */
     async *streamMessages(sessionId) {
         if (!this.client) {
             throw new Error('OpenCode client not initialized. Call initialize() first.');
         }
         try {
-            const response = await this.client.session.messages({
-                path: { id: sessionId },
-            });
-            const messages = response.data || [];
-            for (const msg of messages) {
-                yield {
-                    id: msg.info?.id || 'msg-' + Date.now(),
-                    role: (msg.info?.role || 'assistant'),
-                    content: msg.parts?.map((p) => p.text || '').join('') || '',
-                    timestamp: new Date(),
-                };
+            // Poll messages until agent completes
+            let lastMessageCount = 0;
+            let attempts = 0;
+            const maxAttempts = 60; // 60 attempts * 2s = 2 minutes max
+            while (attempts < maxAttempts) {
+                attempts++;
+                const messagesResponse = (await this.client.session.messages({
+                    path: { id: sessionId },
+                }));
+                const messages = messagesResponse.data ?? [];
+                // Yield any new messages
+                for (let i = lastMessageCount; i < messages.length; i++) {
+                    const msg = messages[i];
+                    yield {
+                        id: msg.info?.id ?? 'msg-' + Date.now(),
+                        role: (msg.info?.role ?? 'assistant'),
+                        content: msg.parts?.map((p) => p.text ?? '').join('') ?? '',
+                        timestamp: new Date(),
+                    };
+                }
+                lastMessageCount = messages.length;
+                // Check if the last assistant message has completed
+                const lastAssistantMsg = [...messages].reverse().find((m) => m.info?.role === 'assistant');
+                if (lastAssistantMsg) {
+                    const isComplete = lastAssistantMsg.info?.time?.completed !== undefined;
+                    const hasError = lastAssistantMsg.info?.error !== undefined;
+                    if (hasError) {
+                        throw new Error(`Agent error: ${JSON.stringify(lastAssistantMsg.info?.error)}`);
+                    }
+                    if (isComplete) {
+                        break;
+                    }
+                }
+                // Wait before polling again
+                await new Promise((resolve) => setTimeout(resolve, 2000));
+            }
+            if (attempts >= maxAttempts) {
+                throw new Error(`Session ${sessionId} timed out after ${maxAttempts * 2} seconds`);
             }
         }
         catch (error) {
@@ -152,8 +349,20 @@ export class OpencodeClient {
      */
     async shutdown() {
         if (this.inProcessServer) {
+            // Close the OpenCode server
             this.inProcessServer.server.close();
-            console.log('OpenCode server stopped');
+            // Give server time to clean up connections
+            await new Promise((resolve) => setTimeout(resolve, 100));
+        }
+        if (this.overlay) {
+            await this.overlay.cleanup();
+            this.overlay = undefined;
+        }
+        if (this.projectRootEnv === undefined) {
+            delete process.env.DRS_PROJECT_ROOT;
+        }
+        else {
+            process.env.DRS_PROJECT_ROOT = this.projectRootEnv;
         }
     }
     /**
@@ -165,6 +374,76 @@ export class OpencodeClient {
         }
         return this.baseUrl;
     }
+    /**
+     * Resolve {env:VAR_NAME} references to actual environment variable values
+     */
+    resolveEnvReferences(obj) {
+        if (typeof obj === 'string') {
+            // Check for {env:VAR_NAME} pattern
+            const envMatch = obj.match(/^\{env:([^}]+)\}$/);
+            if (envMatch) {
+                const envVarName = envMatch[1];
+                const envValue = process.env[envVarName];
+                if (!envValue) {
+                    console.warn(`⚠️  Environment variable ${envVarName} is not set`);
+                    return '';
+                }
+                return envValue;
+            }
+            return obj;
+        }
+        if (Array.isArray(obj)) {
+            return obj.map((item) => this.resolveEnvReferences(item));
+        }
+        if (obj !== null && typeof obj === 'object') {
+            const resolved = {};
+            for (const [key, value] of Object.entries(obj)) {
+                resolved[key] = this.resolveEnvReferences(value);
+            }
+            return resolved;
+        }
+        return obj;
+    }
+}
+function parseServerEndpoint(baseUrl) {
+    try {
+        const url = new URL(baseUrl);
+        const port = url.port !== '' ? Number(url.port) : url.protocol === 'https:' ? 443 : 80;
+        if (!url.hostname || Number.isNaN(port)) {
+            return null;
+        }
+        return { host: url.hostname, port };
+    }
+    catch {
+        return null;
+    }
+}
+async function isServerReachable(baseUrl) {
+    const endpoint = parseServerEndpoint(baseUrl);
+    if (!endpoint) {
+        return false;
+    }
+    return new Promise((resolve) => {
+        const socket = net.createConnection(endpoint, () => {
+            socket.end();
+            resolve(true);
+        });
+        socket.setTimeout(1000);
+        socket.on('timeout', () => {
+            socket.destroy();
+            resolve(false);
+        });
+        socket.on('error', () => resolve(false));
+    });
+}
+async function waitForServerReady(baseUrl, attempts = 10, delayMs = 200) {
+    for (let attempt = 0; attempt < attempts; attempt += 1) {
+        if (await isServerReachable(baseUrl)) {
+            return true;
+        }
+        await new Promise((resolve) => setTimeout(resolve, delayMs));
+    }
+    return false;
 }
 /**
  * Create an OpenCode client with the given configuration