opencode-1password-auth 1.0.7 → 1.0.8

package/index.ts

@@ -43,8 +43,16 @@ interface AuthJson {
 export const OnePasswordAuthPlugin: Plugin = async ({ client, $ }) => {
   let opClient: Awaited<ReturnType<typeof sdk.createClient>> | null = null;
   let mcpsEnvId: string | undefined;
+  let initialized = false;
+  let executionOrder = 0;
 
-  debugLog("Plugin loaded");
+  debugLog(`Plugin loaded (order: ${++executionOrder})`);
+
+  // Log environment variable status (redacted)
+  const token = process.env.OP_SERVICE_ACCOUNT_TOKEN;
+  const configId = process.env.OP_CONFIG_ENV_ID;
+  debugLog(`Environment check - OP_SERVICE_ACCOUNT_TOKEN: ${token ? 'SET' : 'MISSING'} (${token ? token.substring(0, 8) + '...' : 'N/A'})`);
+  debugLog(`Environment check - OP_CONFIG_ENV_ID: ${configId ? 'SET' : 'MISSING'} (${configId ? configId.substring(0, 8) + '...' : 'N/A'})`);
 
   const normalizeProviderId = (variableName: string): string => {
     // Convert common patterns to match auth.json provider IDs
@@ -316,6 +324,11 @@ export const OnePasswordAuthPlugin: Plugin = async ({ client, $ }) => {
 
   // Initialize as soon as plugin loads (config hook runs early)
   const initializePlugin = async () => {
+    debugLog(`initializePlugin called (order: ${++executionOrder})`);
+    if (initialized) {
+      debugLog("initializePlugin: already initialized, skipping");
+      return;
+    }
     debugLog("Initializing plugin...");
 
     opClient = await initClient();
@@ -342,8 +355,9 @@ export const OnePasswordAuthPlugin: Plugin = async ({ client, $ }) => {
 
     const providersEnvId = configEnvIds.OPENCODE_PROVIDERS_ENV_ID;
     if (providersEnvId) {
-      // First update the config files to use env var references
-      await updateAuthJson(providersEnvId);
+      // Authenticate providers - client.auth.set() will write to auth.json
+      // SKIP updateAuthJson - it writes {env:...} placeholders which cause issues
+      // await updateAuthJson(providersEnvId);
       await authenticateProviders(providersEnvId);
     }
 
@@ -357,19 +371,35 @@ export const OnePasswordAuthPlugin: Plugin = async ({ client, $ }) => {
       }
     }
 
+    initialized = true;
     debugLog("Plugin initialization complete");
   };
 
-  // Start initialization immediately
-  initializePlugin().catch(err => {
-    debugLog(`Failed to initialize plugin: ${err}`);
-  });
+  // Start initialization immediately (but config hook might run first)
+  debugLog(`Starting immediate initialization (order: ${++executionOrder})`);
+  if (!initialized) {
+    initializePlugin().catch(err => {
+      debugLog(`Failed to initialize plugin: ${err}`);
+    });
+  } else {
+    debugLog("Already initialized, skipping immediate init");
+  }
 
   return {
     async config(config: any) {
-      debugLog("Config hook called");
-      // Config hook runs early, we could also initialize here
-      // but we're already initializing above
+      debugLog(`Config hook called (order: ${++executionOrder})`);
+      // Config hook runs early - try to authenticate here
+      if (!initialized) {
+        debugLog("Config hook: attempting authentication");
+        try {
+          await initializePlugin();
+          initialized = true;
+        } catch (err) {
+          debugLog(`Config hook authentication failed: ${err}`);
+        }
+      } else {
+        debugLog("Config hook: already initialized");
+      }
     },
 
     async event({ event }: { event: { type: string } }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-1password-auth",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "1Password integration for OpenCode - authenticate providers and inject MCP secrets from 1Password environments",
   "type": "module",
   "main": "index.ts",