chore: sync from internal

Author: phantom-commit-bot[bot]

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/cli",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "Phantom CLI — interact with your Phantom wallet from the terminal",
   "repository": {
     "type": "git",

packages/mcp-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/mcp-server",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "MCP Server for Phantom Wallet",
   "repository": {
     "type": "git",

packages/phantom-openclaw-plugin/eslint.config.mjs

@@ -0,0 +1,17 @@
+import baseConfig from "../../eslint.shared.mjs";
+
+export default [
+  ...baseConfig,
+  {
+    files: ["**/*.ts"],
+    rules: {
+      "no-restricted-syntax": [
+        "error",
+        {
+          selector: "MemberExpression[object.name='process'][property.name='env']",
+          message: "Do not use process.env — pass config explicitly.",
+        },
+      ],
+    },
+  },
+];

packages/phantom-openclaw-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/phantom-openclaw-plugin",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "Phantom Embedded Wallet — sign transactions, transfer tokens, and swap on Solana and Ethereum. Powered by Phantom.",
   "repository": {
     "type": "git",

packages/phantom-openclaw-plugin/src/index.ts

@@ -50,28 +50,11 @@ function getPluginConfig(fullConfig?: Record<string, unknown>): Record<string, u
   return fullConfig;
 }
 
-function applyConfigToEnv(config?: Record<string, unknown>): void {
-  if (!config) return;
-
-  const pluginConfig = PluginConfigSchema.parse(config);
-
-  for (const [key, value] of Object.entries(pluginConfig)) {
-    if (value !== undefined) {
-      process.env[key] = String(value);
-    }
-  }
-}
-
 /**
  * Get or create the plugin session with configuration
  */
-function getSession(config?: Record<string, unknown>): PluginSession {
+function getSession(callbackPort?: number): PluginSession {
   if (!sessionInstance) {
-    const pluginConfig = getPluginConfig(config);
-    applyConfigToEnv(pluginConfig);
-    const envPort = process.env.PHANTOM_CALLBACK_PORT;
-    const callbackPort = envPort ? Number.parseInt(envPort, 10) : undefined;
-
     sessionInstance = new PluginSession({
       callbackPort,
       authFlow: "device-code",
@@ -92,8 +75,10 @@ function resetSession(): void {
  */
 export default function register(api: OpenClawApi) {
   try {
-    const session = getSession(api.config);
-    registerPhantomTools(api, session);
+    const rawConfig = getPluginConfig(api.config) ?? {};
+    const config = PluginConfigSchema.parse(rawConfig);
+    const session = getSession(config.PHANTOM_CALLBACK_PORT);
+    registerPhantomTools(api, session, config);
   } catch (error) {
     console.error("Failed to initialize Phantom OpenClaw plugin:", error);
     // Reset singleton so next attempt gets a fresh instance

packages/phantom-openclaw-plugin/src/tools/register-tools.test.ts

@@ -68,7 +68,7 @@ function registerToolsForTest() {
     getOAuthHeaders: jest.fn().mockReturnValue({ authorization: "Bearer token", "x-auth-user-id": "user-1" }),
   } as unknown as PluginSession;
 
-  registerPhantomTools(api, session);
+  registerPhantomTools(api, session, {});
   return { registeredTools, registeredContexts };
 }
 

packages/phantom-openclaw-plugin/src/tools/register-tools.ts

@@ -4,12 +4,11 @@
 
 import { Type } from "@sinclair/typebox";
 import type { TSchema } from "@sinclair/typebox";
-import { SessionManager, tools } from "@phantom/cli";
+import { SessionManager, tools, type PluginConfig, type ToolContext } from "@phantom/cli";
 import { PhantomApiClient } from "@phantom/phantom-api-client";
 import type { OpenClawApi } from "../client/types.js";
 import type { PluginSession } from "../session.js";
 import * as packageJson from "../../package.json";
-import type { ToolContext } from "@phantom/cli";
 
 /**
  * Convert MCP tool JSON schema to TypeBox schema
@@ -347,16 +346,16 @@ function addPluginVersion(result: unknown): unknown {
 /**
  * Register all Phantom MCP tools with OpenClaw
  */
-export function registerPhantomTools(api: OpenClawApi, pluginSession: PluginSession): void {
+export function registerPhantomTools(api: OpenClawApi, pluginSession: PluginSession, config: PluginConfig): void {
   const apiClient = new PhantomApiClient({
-    baseUrl: process.env.PHANTOM_API_BASE_URL ?? "https://api.phantom.app",
+    baseUrl: config.PHANTOM_API_BASE_URL ?? "https://api.phantom.app",
   });
   const manager = new SessionManager();
 
   const staticHeaders: Record<string, string> = {
     [ANALYTICS_HEADER_PLATFORM]: "ext-sdk",
     [ANALYTICS_HEADER_CLIENT]: "mcp",
-    [ANALYTICS_HEADER_SDK_VERSION]: process.env.PHANTOM_VERSION ?? packageJson.version ?? "unknown",
+    [ANALYTICS_HEADER_SDK_VERSION]: config.PHANTOM_VERSION ?? packageJson.version ?? "unknown",
   };
   apiClient.setHeaders(staticHeaders);
   apiClient.setGetHeaders(() => pluginSession.getOAuthHeaders());
@@ -464,8 +463,8 @@ export function registerPhantomTools(api: OpenClawApi, pluginSession: PluginSess
 
           const sessionData = pluginSession.getSession();
           const appId =
-            process.env.PHANTOM_APP_ID ??
-            process.env.PHANTOM_CLIENT_ID ??
+            config.PHANTOM_APP_ID ??
+            config.PHANTOM_CLIENT_ID ??
             (typeof sessionData.appId === "string" ? sessionData.appId : undefined);
           if (appId) {
             apiClient.setHeaders({