Address PR feedback for OpenCode integration

packages/adapters/opencode-local/src/server/execute.ts

@@ -115,7 +115,7 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec
     model,
     command,
     cwd,
-    env,
+    env: runtimeEnv,
   });
 
   const timeoutSec = asNumber(config.timeoutSec, 0);
@@ -244,7 +244,9 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec
       };
     }
 
-    const resolvedSessionId = attempt.parsed.sessionId ?? runtimeSessionId ?? runtime.sessionId ?? null;
+    const resolvedSessionId =
+      attempt.parsed.sessionId ??
+      (clearSessionOnMissingSession ? null : runtimeSessionId ?? runtime.sessionId ?? null);
     const resolvedSessionParams = resolvedSessionId
       ? ({
           sessionId: resolvedSessionId,
@@ -287,7 +289,7 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec
         stderr: attempt.proc.stderr,
       },
       summary: attempt.parsed.summary,
-      clearSession: Boolean(clearSessionOnMissingSession && !resolvedSessionId),
+      clearSession: Boolean(clearSessionOnMissingSession && !attempt.parsed.sessionId),
     };
   };
 

packages/adapters/opencode-local/src/server/models.ts

@@ -1,12 +1,16 @@
+import { createHash } from "node:crypto";
 import type { AdapterModel } from "@paperclipai/adapter-utils";
 import {
   asString,
+  ensurePathInEnv,
   runChildProcess,
 } from "@paperclipai/adapter-utils/server-utils";
 
 const MODELS_CACHE_TTL_MS = 60_000;
 
 const discoveryCache = new Map<string, { expiresAt: number; models: AdapterModel[] }>();
+const VOLATILE_ENV_KEY_PREFIXES = ["PAPERCLIP_", "npm_", "NPM_"] as const;
+const VOLATILE_ENV_KEY_EXACT = new Set(["PWD", "OLDPWD", "SHLVL", "_", "TERM_SESSION_ID"]);
 
 function dedupeModels(models: AdapterModel[]): AdapterModel[] {
   const seen = new Set<string>();
@@ -61,14 +65,30 @@ function normalizeEnv(input: unknown): Record<string, string> {
   return env;
 }
 
+function isVolatileEnvKey(key: string): boolean {
+  if (VOLATILE_ENV_KEY_EXACT.has(key)) return true;
+  return VOLATILE_ENV_KEY_PREFIXES.some((prefix) => key.startsWith(prefix));
+}
+
+function hashValue(value: string): string {
+  return createHash("sha256").update(value).digest("hex");
+}
+
 function discoveryCacheKey(command: string, cwd: string, env: Record<string, string>) {
   const envKey = Object.entries(env)
+    .filter(([key]) => !isVolatileEnvKey(key))
     .sort(([a], [b]) => a.localeCompare(b))
-    .map(([key, value]) => `${key}=${value}`)
+    .map(([key, value]) => `${key}=${hashValue(value)}`)
     .join("\n");
   return `${command}\n${cwd}\n${envKey}`;
 }
 
+function pruneExpiredDiscoveryCache(now: number) {
+  for (const [key, value] of discoveryCache.entries()) {
+    if (value.expiresAt <= now) discoveryCache.delete(key);
+  }
+}
+
 export async function discoverOpenCodeModels(input: {
   command?: unknown;
   cwd?: unknown;
@@ -83,6 +103,7 @@ export async function discoverOpenCodeModels(input: {
   );
   const cwd = asString(input.cwd, process.cwd());
   const env = normalizeEnv(input.env);
+  const runtimeEnv = normalizeEnv(ensurePathInEnv({ ...process.env, ...env }));
 
   const result = await runChildProcess(
     `opencode-models-${Date.now()}-${Math.random().toString(16).slice(2)}`,
@@ -90,7 +111,7 @@ export async function discoverOpenCodeModels(input: {
     ["models"],
     {
       cwd,
-      env,
+      env: runtimeEnv,
       timeoutSec: 20,
       graceSec: 3,
       onLog: async () => {},
@@ -124,6 +145,7 @@ export async function discoverOpenCodeModelsCached(input: {
   const env = normalizeEnv(input.env);
   const key = discoveryCacheKey(command, cwd, env);
   const now = Date.now();
+  pruneExpiredDiscoveryCache(now);
   const cached = discoveryCache.get(key);
   if (cached && cached.expiresAt > now) return cached.models;
 

packages/adapters/opencode-local/src/server/test.ts

@@ -38,6 +38,15 @@ function summarizeProbeDetail(stdout: string, stderr: string, parsedError: strin
   return clean.length > max ? `${clean.slice(0, max - 1)}...` : clean;
 }
 
+function normalizeEnv(input: unknown): Record<string, string> {
+  if (typeof input !== "object" || input === null || Array.isArray(input)) return {};
+  const env: Record<string, string> = {};
+  for (const [key, value] of Object.entries(input as Record<string, unknown>)) {
+    if (typeof value === "string") env[key] = value;
+  }
+  return env;
+}
+
 const OPENCODE_AUTH_REQUIRED_RE =
   /(?:auth(?:entication)?\s+required|api\s*key|invalid\s*api\s*key|not\s+logged\s+in|opencode\s+auth\s+login|free\s+usage\s+exceeded)/i;
 
@@ -50,7 +59,7 @@ export async function testEnvironment(
   const cwd = asString(config.cwd, process.cwd());
 
   try {
-    await ensureAbsoluteDirectory(cwd, { createIfMissing: true });
+    await ensureAbsoluteDirectory(cwd, { createIfMissing: false });
     checks.push({
       code: "opencode_cwd_valid",
       level: "info",
@@ -70,7 +79,7 @@ export async function testEnvironment(
   for (const [key, value] of Object.entries(envConfig)) {
     if (typeof value === "string") env[key] = value;
   }
-  const runtimeEnv = ensurePathInEnv({ ...process.env, ...env });
+  const runtimeEnv = normalizeEnv(ensurePathInEnv({ ...process.env, ...env }));
 
   try {
     await ensureCommandResolvable(command, cwd, runtimeEnv);
@@ -91,17 +100,15 @@ export async function testEnvironment(
   const canRunProbe =
     checks.every((check) => check.code !== "opencode_cwd_invalid" && check.code !== "opencode_command_unresolvable");
 
-  let discoveredModels: string[] = [];
   let modelValidationPassed = false;
   if (canRunProbe) {
     try {
-      const discovered = await discoverOpenCodeModels({ command, cwd, env });
-      discoveredModels = discovered.map((item) => item.id);
-      if (discoveredModels.length > 0) {
+      const discovered = await discoverOpenCodeModels({ command, cwd, env: runtimeEnv });
+      if (discovered.length > 0) {
         checks.push({
           code: "opencode_models_discovered",
           level: "info",
-          message: `Discovered ${discoveredModels.length} model(s) from OpenCode providers.`,
+          message: `Discovered ${discovered.length} model(s) from OpenCode providers.`,
         });
       } else {
         checks.push({
@@ -135,7 +142,7 @@ export async function testEnvironment(
         model: configuredModel,
         command,
         cwd,
-        env,
+        env: runtimeEnv,
       });
       checks.push({
         code: "opencode_model_configured",
@@ -173,7 +180,7 @@ export async function testEnvironment(
       args,
       {
         cwd,
-        env,
+        env: runtimeEnv,
         timeoutSec: 60,
         graceSec: 5,
         stdin: "Respond with hello.",