@khalilgharbaoui/opencode-claude-code-plugin 0.4.2 → 0.4.3

package/dist/index.js

@@ -577,6 +577,17 @@ function dotOpencodeDirs(cwd, worktree) {
   if (envDir && dirExists(envDir)) push(envDir);
   return dirs;
 }
+function substituteEnvPlaceholders(source) {
+  const out = {};
+  for (const [k, v] of Object.entries(source)) {
+    if (typeof v !== "string") continue;
+    out[k] = v.replace(/\{env:([A-Za-z_][A-Za-z0-9_]*)\}/g, (_match, name) => {
+      const resolved = process.env[name];
+      return typeof resolved === "string" ? resolved : "";
+    });
+  }
+  return out;
+}
 function translateServer(name, spec) {
   if (spec.enabled === false) return null;
   const type = spec.type;
@@ -592,7 +603,9 @@ function translateServer(name, spec) {
     };
     if (cmd.length > 1) out.args = cmd.slice(1).map((s) => String(s));
     if (spec.environment && typeof spec.environment === "object") {
-      out.env = spec.environment;
+      out.env = substituteEnvPlaceholders(
+        spec.environment
+      );
     }
     return out;
   }
@@ -606,7 +619,9 @@ function translateServer(name, spec) {
       url: spec.url
     };
     if (spec.headers && typeof spec.headers === "object") {
-      out.headers = spec.headers;
+      out.headers = substituteEnvPlaceholders(
+        spec.headers
+      );
     }
     return out;
   }
@@ -2857,6 +2872,33 @@ ${plan}
                 });
                 turnCompleted = true;
                 endTextBlock();
+                if (drainBuffer.length > 0) {
+                  log.info(
+                    "draining pending proxy calls at turn-result boundary",
+                    {
+                      sessionKey: sk,
+                      count: drainBuffer.length
+                    }
+                  );
+                  drainNow();
+                  return;
+                }
+                const orphanPending = getPendingProxyCalls(sk);
+                if (orphanPending.length > 0) {
+                  log.warn(
+                    "rejecting orphan pending proxy calls at turn-result boundary",
+                    {
+                      sessionKey: sk,
+                      count: orphanPending.length
+                    }
+                  );
+                  rejectAllPendingProxyCallsForSession(
+                    sk,
+                    new Error(
+                      "Claude CLI emitted result with pending proxy calls not in drain buffer"
+                    )
+                  );
+                }
                 for (const [idx, reasoningId] of reasoningIds) {
                   if (reasoningStarted.get(idx)) {
                     controller.enqueue({