opencode-1password-auth 1.0.0 → 1.0.1

package/index.ts

@@ -1,5 +1,8 @@
 import type { Plugin } from "@opencode-ai/plugin";
 import * as sdk from "@1password/sdk";
+import * as fs from "fs";
+import * as path from "path";
+import * as os from "os";
 
 interface MCPServerConfig {
   environment?: Record<string, string>;
@@ -9,6 +12,18 @@ interface OpenCodeConfig {
   mcp?: Record<string, MCPServerConfig>;
 }
 
+interface ProviderAuth {
+  type: string;
+  key: string;
+}
+
+interface AuthJson {
+  [providerId: string]: ProviderAuth;
+}
+
+const AUTH_JSON_PATH = path.join(os.homedir(), ".local", "share", "opencode", "auth.json");
+const OPENCODE_JSON_PATH = path.join(os.homedir(), ".config", "opencode", "opencode.json");
+
 export const OnePasswordAuthPlugin: Plugin = async (ctx) => {
   let opClient: Awaited<ReturnType<typeof sdk.createClient>> | null = null;
   let mcpsEnvId: string | undefined;
@@ -55,6 +70,74 @@ export const OnePasswordAuthPlugin: Plugin = async (ctx) => {
     return secrets;
   };
 
+  const updateAuthJson = async (providerEnvId: string): Promise<void> => {
+    if (!fs.existsSync(AUTH_JSON_PATH)) {
+      console.log("1Password: auth.json not found, skipping");
+      return;
+    }
+
+    try {
+      const content = fs.readFileSync(AUTH_JSON_PATH, "utf-8");
+      const auth: AuthJson = JSON.parse(content);
+      let modified = false;
+
+      for (const [providerId, authConfig] of Object.entries(auth)) {
+        if (authConfig.key && !authConfig.key.startsWith("{env:")) {
+          // Replace hardcoded key with env var reference
+          authConfig.key = `{env:${providerId}}`;
+          modified = true;
+          console.log(`1Password: Updated auth.json - ${providerId} -> {env:${providerId}}`);
+        }
+      }
+
+      if (modified) {
+        fs.writeFileSync(AUTH_JSON_PATH, JSON.stringify(auth, null, 2));
+        console.log("1Password: auth.json updated to use environment variables");
+      }
+    } catch (err) {
+      console.error("1Password: Failed to update auth.json:", err);
+    }
+  };
+
+  const updateOpenCodeJsonMCP = async (mcpEnvId: string): Promise<void> => {
+    if (!fs.existsSync(OPENCODE_JSON_PATH)) {
+      console.log("1Password: opencode.json not found, skipping");
+      return;
+    }
+
+    try {
+      const content = fs.readFileSync(OPENCODE_JSON_PATH, "utf-8");
+      const config = JSON.parse(content);
+
+      if (!config.mcp) {
+        console.log("1Password: No MCP configuration found, skipping");
+        return;
+      }
+
+      let modified = false;
+
+      for (const [serverName, serverConfig] of Object.entries(config.mcp)) {
+        if (serverConfig?.environment) {
+          for (const [key, value] of Object.entries(serverConfig.environment)) {
+            if (typeof value === "string" && !value.startsWith("{env:") && !value.startsWith("$")) {
+              // Replace hardcoded value with env var reference
+              serverConfig.environment[key] = `{env:${key}}`;
+              modified = true;
+              console.log(`1Password: Updated opencode.json - ${serverName}.${key} -> {env:${key}}`);
+            }
+          }
+        }
+      }
+
+      if (modified) {
+        fs.writeFileSync(OPENCODE_JSON_PATH, JSON.stringify(config, null, 2));
+        console.log("1Password: opencode.json MCP config updated to use environment variables");
+      }
+    } catch (err) {
+      console.error("1Password: Failed to update opencode.json:", err);
+    }
+  };
+
   const authenticateProviders = async (providerEnvId: string): Promise<void> => {
     if (!opClient) return;
 
@@ -146,12 +229,15 @@ export const OnePasswordAuthPlugin: Plugin = async (ctx) => {
 
         const providersEnvId = configEnvIds.OPENCODE_PROVIDERS_ENV_ID;
         if (providersEnvId) {
+          // First update the config files to use env var references
+          await updateAuthJson(providersEnvId);
           await authenticateProviders(providersEnvId);
         }
 
         const mcpEnvIdFromConfig = configEnvIds.OPENCODE_MCPS_ENV_ID;
         if (mcpEnvIdFromConfig) {
           mcpsEnvId = mcpEnvIdFromConfig;
+          await updateOpenCodeJsonMCP(mcpEnvIdFromConfig);
           const toInject = await injectMCPSecrets(mcpEnvIdFromConfig);
           if (Object.keys(toInject).length > 0) {
             console.log(`1Password: Injected ${Object.keys(toInject).join(", ")} for MCP`);

package/package.json

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

package/setup.ps1

@@ -65,31 +65,53 @@ function Remove-RegistryValue {
     }
 }
 
+function Get-OpenCodeNodeModulesPath {
+    $paths = @(
+        "$env:USERPROFILE\.cache\opencode\node_modules",
+        "$env:USERPROFILE\.config\opencode\node_modules",
+        "$env:APPDATA\opencode\node_modules"
+    )
+    
+    foreach ($path in $paths) {
+        if (Test-Path "$path\@1password\sdk") {
+            return $path
+        }
+    }
+    return $null
+}
+
 function Test-1PasswordConnection {
     param([string]$Token)
     
     try {
-        # Create a temporary Node.js script to test the SDK
-        $testScript = @"
-const sdk = require('@1password/sdk');
-
-async function test() {
-    const client = await sdk.createClient({
-        auth: '$Token',
-        integrationName: 'opencode-1password-setup-test',
-        integrationVersion: '1.0.0'
-    });
-    
-    console.log('SUCCESS');
-}
-
-test().catch(err => {
-    console.error('FAILED:', err.message);
-    process.exit(1);
-});
-"@
+        $nodeModulesPath = Get-OpenCodeNodeModulesPath
+        
+        if (-not $nodeModulesPath) {
+            Write-Error "Could not find @1password/sdk in any node_modules directory"
+            return $false
+        }
+        
+        $sdkPath = ($nodeModulesPath -replace '\\', '/') + "/@1password/sdk/dist/sdk.js"
+        
+        # Create a temporary Node.js script file
+        $tempScript = [System.IO.Path]::GetTempFileName() -replace '\.tmp$', '.js'
+        
+        $testScript = 'const sdk = require("' + $sdkPath + '");' + "`n" +
+            'async function test() {' + "`n" +
+            '    const client = await sdk.createClient({' + "`n" +
+            '        auth: "' + $Token + '",' + "`n" +
+            '        integrationName: "opencode-1password-setup-test",' + "`n" +
+            '        integrationVersion: "1.0.0"' + "`n" +
+            '    });' + "`n" +
+            '    console.log("SUCCESS");' + "`n" +
+            '}' + "`n" +
+            'test().catch(err => { console.error("FAILED:", err.message); process.exit(1); });'
+        
+        $testScript | Out-File -FilePath $tempScript -Encoding UTF8 -NoNewline
+        
+        $result = & node $tempScript 2>&1
+        Remove-Item $tempScript -ErrorAction SilentlyContinue
         
-        $result = node -e $testScript 2>&1
         return $result -match "SUCCESS"
     } catch {
         return $false
@@ -100,36 +122,37 @@ function Get-1PasswordAudit {
     param([string]$Token, [string]$ConfigEnvId)
     
     try {
-        $script = @"
-const sdk = require('@1password/sdk');
-
-async function audit() {
-    const client = await sdk.createClient({
-        auth: '$Token',
-        integrationName: 'opencode-1password-setup-test',
-        integrationVersion: '1.0.0'
-    });
-    
-    // Read bootstrap environment
-    const { variables: configVars } = await client.environments.getVariables('$ConfigEnvId');
-    
-    const envIds = {};
-    for (const v of configVars) {
-        if (v.name.endsWith('_ENV_ID') && v.value) {
-            envIds[v.name] = v.value;
+        $nodeModulesPath = Get-OpenCodeNodeModulesPath
+        
+        if (-not $nodeModulesPath) {
+            Write-Error "Could not find @1password/sdk in any node_modules directory"
+            return $null
         }
-    }
-    
-    console.log(JSON.stringify(envIds));
-}
-
-audit().catch(err => {
-    console.error('FAILED:', err.message);
-    process.exit(1);
-});
-"@
         
-        $jsonResult = node -e $script 2>&1 | Out-String
+        $sdkPath = ($nodeModulesPath -replace '\\', '/') + "/@1password/sdk/dist/sdk.js"
+        
+        $script = 'const sdk = require("' + $sdkPath + '");' + "`n" +
+            'async function audit() {' + "`n" +
+            '    const client = await sdk.createClient({' + "`n" +
+            '        auth: "' + $Token + '",' + "`n" +
+            '        integrationName: "opencode-1password-setup-test",' + "`n" +
+            '        integrationVersion: "1.0.0"' + "`n" +
+            '    });' + "`n" +
+            '    const { variables: configVars } = await client.environments.getVariables("' + $ConfigEnvId + '");' + "`n" +
+            '    const envIds = {};' + "`n" +
+            '    for (const v of configVars) {' + "`n" +
+            '        if (v.name.endsWith("_ENV_ID") && v.value) {' + "`n" +
+            '            envIds[v.name] = v.value;' + "`n" +
+            '        }' + "`n" +
+            '    }' + "`n" +
+            '    console.log(JSON.stringify(envIds));' + "`n" +
+            '}' + "`n" +
+            'audit().catch(err => { console.error("FAILED:", err.message); process.exit(1); });'
+        
+        $tempScript = [System.IO.Path]::GetTempFileName() -replace '\.tmp$', '.js'
+        $script | Out-File -FilePath $tempScript -Encoding UTF8 -NoNewline
+        $jsonResult = & node $tempScript 2>&1 | Out-String
+        Remove-Item $tempScript -ErrorAction SilentlyContinue
         return $jsonResult | ConvertFrom-Json
     } catch {
         return $null
@@ -139,6 +162,8 @@ audit().catch(err => {
 function Show-AuditReport {
     param([string]$Token, [hashtable]$EnvIds)
     
+    $nodeModulesPath = Get-OpenCodeNodeModulesPath
+    
     Write-Host ""
     Write-Host "========================================" -ForegroundColor Cyan
     Write-Host "  Configuration Audit Report" -ForegroundColor Cyan
@@ -163,30 +188,27 @@ function Show-AuditReport {
         Write-Host "--------------------------------"
         
         try {
-            $script = @"
-const sdk = require('@1password/sdk');
-
-async function read() {
-    const client = await sdk.createClient({
-        auth: '$Token',
-        integrationName: 'opencode-1password-setup-test',
-        integrationVersion: '1.0.0'
-    });
-    
-    const { variables } = await client.environments.getVariables('$envId');
-    
-    for (const v of variables) {
-        const masked = v.value ? v.value.substring(0, 8) + '••••••••' : '(empty)';
-        console.log(v.name + '=' + masked);
-    }
-}
-
-read().catch(err => {
-    console.error('Error:', err.message);
-});
-"@
+        # Use forward slashes to avoid JS escape sequence issues
+        $sdkPath = ($nodeModulesPath -replace '\\', '/') + "/@1password/sdk/dist/sdk.js"
+            $script = 'const sdk = require("' + $sdkPath + '");' + "`n" +
+                'async function read() {' + "`n" +
+                '    const client = await sdk.createClient({' + "`n" +
+                '        auth: "' + $Token + '",' + "`n" +
+                '        integrationName: "opencode-1password-setup-test",' + "`n" +
+                '        integrationVersion: "1.0.0"' + "`n" +
+                '    });' + "`n" +
+                '    const { variables } = await client.environments.getVariables("' + $envId + '");' + "`n" +
+                '    for (const v of variables) {' + "`n" +
+                '        const masked = v.value ? v.value.substring(0, 8) + "••••••••" : "(empty)";' + "`n" +
+                '        console.log(v.name + "=" + masked);' + "`n" +
+                '    }' + "`n" +
+                '}' + "`n" +
+                'read().catch(err => { console.error("Error:", err.message); });'
             
-            $result = node -e $script 2>&1
+            $tempScript = [System.IO.Path]::GetTempFileName() -replace '\.tmp$', '.js'
+            $script | Out-File -FilePath $tempScript -Encoding UTF8 -NoNewline
+            $result = & node $tempScript 2>&1
+            Remove-Item $tempScript -ErrorAction SilentlyContinue
             foreach ($line in $result) {
                 if ($line -and $line -notmatch "^(Error|Error:)") {
                     Write-Host "  $line" -ForegroundColor Gray