@blockrun/llm 3.6.1 → 3.7.1

package/README.md

@@ -1295,9 +1295,10 @@ await status();
 // Balance: $5.30 USDC
 ```
 
-## Wallet Scanning
+## Wallet Discovery and Migration
 
-The SDK auto-detects wallets from any provider on your system:
+The SDK can discover compatible wallets for an explicit, user-confirmed
+migration. It never automatically makes a discovered provider wallet active:
 
 ```typescript
 import { scanWallets, scanSolanaWallets } from '@blockrun/llm';
@@ -1309,7 +1310,30 @@ const baseWallets = scanWallets();
 const solWallets = scanSolanaWallets();
 ```
 
-`getOrCreateWallet()` checks scanned wallets first, so if you already have a wallet from another BlockRun tool, it will be reused automatically.
+`getOrCreateWallet()` always uses `~/.blockrun/.session` (or an explicit
+wallet environment variable, or the legacy `~/.blockrun/wallet.key`). Review
+the discovered addresses and import one explicitly if you intend to switch
+wallets.
+
+### Upgrading from a provider wallet
+
+Earlier versions adopted the most recently written provider wallet
+automatically. If you relied on that, the first run after upgrading creates a
+fresh BlockRun wallet and prints the addresses it found, so you can import the
+one you actually own:
+
+```
+NOTICE: BlockRun created a new wallet, but also found existing wallet(s)
+belonging to other applications on this system:
+
+  0x88f9B82462f6C4bf4a0Fb15e5c3971559a316e7f
+...
+```
+
+Import it deliberately with `export BLOCKRUN_WALLET_KEY=<private-key>`, or by
+writing the key to `~/.blockrun/.session`. Addresses in that notice are derived
+from the discovered key itself, so a wallet file cannot claim an address it
+cannot sign for.
 
 ## Response Caching
 

package/dist/index.cjs

@@ -72,7 +72,9 @@ __export(index_exports, {
   extractPaymentDetails: () => extractPaymentDetails,
   formatFundingMessageCompact: () => formatFundingMessageCompact,
   formatNeedsFundingMessage: () => formatNeedsFundingMessage,
+  formatSolanaWalletMigrationNotice: () => formatSolanaWalletMigrationNotice,
   formatWalletCreatedMessage: () => formatWalletCreatedMessage,
+  formatWalletMigrationNotice: () => formatWalletMigrationNotice,
   getCached: () => getCached,
   getCachedByRequest: () => getCachedByRequest,
   getCostLogSummary: () => getCostLogSummary,
@@ -161,6 +163,16 @@ function createNonce() {
   crypto.getRandomValues(bytes);
   return `0x${Array.from(bytes).map((b) => b.toString(16).padStart(2, "0")).join("")}`;
 }
+var BLOCKRUN_SERVICE_CODE = "blockrun";
+function withBuilderCodeServiceCode(extensions) {
+  const merged = { ...extensions || {} };
+  const existing = merged["builder-code"] || {};
+  merged["builder-code"] = {
+    ...existing,
+    info: { ...existing.info || {}, s: [BLOCKRUN_SERVICE_CODE] }
+  };
+  return merged;
+}
 async function createPaymentPayload(privateKey, fromAddress, recipient, amount, network = "eip155:8453", options = {}) {
   const now = Math.floor(Date.now() / 1e3);
   const validAfter = now - 600;
@@ -208,7 +220,7 @@ async function createPaymentPayload(privateKey, fromAddress, recipient, amount,
         nonce
       }
     },
-    extensions: options.extensions || {}
+    extensions: withBuilderCodeServiceCode(options.extensions)
   };
   return btoa(JSON.stringify(paymentData));
 }
@@ -268,7 +280,7 @@ async function createSolanaPaymentPayload(secretKey, fromAddress, recipient, amo
     payload: {
       transaction: serializedTx
     },
-    extensions: options.extensions || {}
+    extensions: withBuilderCodeServiceCode(options.extensions)
   };
   return btoa(JSON.stringify(paymentData));
 }
@@ -4631,8 +4643,6 @@ function scanWallets() {
   return results.map(({ privateKey, address }) => ({ privateKey, address }));
 }
 function loadWallet() {
-  const wallets = scanWallets();
-  if (wallets.length > 0) return wallets[0].privateKey;
   if (fs2.existsSync(WALLET_FILE)) {
     const key = fs2.readFileSync(WALLET_FILE, "utf-8").trim();
     if (key) return key;
@@ -4644,6 +4654,44 @@ function loadWallet() {
   }
   return null;
 }
+function formatWalletMigrationNotice(newAddress) {
+  let discovered;
+  try {
+    discovered = scanWallets();
+  } catch {
+    return null;
+  }
+  const addresses = [];
+  for (const entry of discovered) {
+    try {
+      addresses.push((0, import_accounts15.privateKeyToAccount)(entry.privateKey).address);
+    } catch {
+      continue;
+    }
+  }
+  if (addresses.length === 0) return null;
+  const found = addresses.map((addr) => `  ${addr}`).join("\n");
+  return `
+NOTICE: BlockRun created a new wallet, but also found existing wallet(s)
+belonging to other applications on this system:
+
+${found}
+
+BlockRun now uses only its own wallet:
+
+  ${newAddress}
+
+Discovered wallets are never adopted automatically \u2014 one may belong to a
+different application, or have been planted to make you fund an address you
+do not control.
+
+If an address above is yours and holds your USDC, import it deliberately:
+
+  export BLOCKRUN_WALLET_KEY=<private-key>
+
+or write that key to ~/.blockrun/.session
+`;
+}
 function getOrCreateWallet() {
   const envKey = typeof process !== "undefined" && process.env ? process.env.BLOCKRUN_WALLET_KEY || process.env.BASE_CHAIN_WALLET_KEY : void 0;
   if (envKey) {
@@ -4813,24 +4861,56 @@ function scanSolanaWallets() {
   return results.map(({ secretKey, publicKey }) => ({ secretKey, publicKey }));
 }
 function loadSolanaWallet() {
-  const wallets = scanSolanaWallets();
-  if (wallets.length > 0) return wallets[0].secretKey;
   if (fs3.existsSync(SOLANA_WALLET_FILE)) {
     const key = fs3.readFileSync(SOLANA_WALLET_FILE, "utf-8").trim();
     if (key) return key;
   }
   return null;
 }
+async function formatSolanaWalletMigrationNotice(newAddress) {
+  let discovered;
+  try {
+    discovered = scanSolanaWallets();
+  } catch {
+    return null;
+  }
+  const addresses = [];
+  for (const entry of discovered) {
+    try {
+      addresses.push(await solanaPublicKey(entry.secretKey));
+    } catch {
+      continue;
+    }
+  }
+  if (addresses.length === 0) return null;
+  const found = addresses.map((addr) => `  ${addr}`).join("\n");
+  return `
+NOTICE: BlockRun created a new Solana wallet, but also found existing
+wallet(s) belonging to other applications on this system:
+
+${found}
+
+BlockRun now uses only its own wallet:
+
+  ${newAddress}
+
+Discovered wallets are never adopted automatically \u2014 one may belong to a
+different application, or have been planted to make you fund an address you
+do not control.
+
+If an address above is yours and holds your USDC, import it deliberately:
+
+  export SOLANA_WALLET_KEY=<private-key>
+
+or write that key to ~/.blockrun/.solana-session
+`;
+}
 async function getOrCreateSolanaWallet() {
   const envKey = typeof process !== "undefined" && process.env ? process.env.SOLANA_WALLET_KEY : void 0;
   if (envKey) {
     const address2 = await solanaPublicKey(envKey);
     return { privateKey: envKey, address: address2, isNew: false };
   }
-  const wallets = scanSolanaWallets();
-  if (wallets.length > 0) {
-    return { privateKey: wallets[0].secretKey, address: wallets[0].publicKey, isNew: false };
-  }
   if (fs3.existsSync(SOLANA_WALLET_FILE)) {
     const fileKey = fs3.readFileSync(SOLANA_WALLET_FILE, "utf-8").trim();
     if (fileKey) {
@@ -5655,27 +5735,35 @@ function getCostLogSummary() {
 // src/setup.ts
 function setupAgentWallet(options) {
   const { address, privateKey, isNew } = getOrCreateWallet();
-  if (isNew && !options?.silent) {
-    console.error(
-      `
+  if (isNew) {
+    const notice = formatWalletMigrationNotice(address);
+    if (notice) console.error(notice);
+    if (!options?.silent) {
+      console.error(
+        `
 BlockRun Agent Wallet Created!
 Address: ${address}
 Send USDC on Base to get started.
 `
-    );
+      );
+    }
   }
   return new LLMClient({ privateKey });
 }
 async function setupAgentSolanaWallet(options) {
   const result = await getOrCreateSolanaWallet();
-  if (result.isNew && !options?.silent) {
-    console.error(
-      `
+  if (result.isNew) {
+    const notice = await formatSolanaWalletMigrationNotice(result.address);
+    if (notice) console.error(notice);
+    if (!options?.silent) {
+      console.error(
+        `
 BlockRun Solana Agent Wallet Created!
 Address: ${result.address}
 Send USDC on Solana to get started.
 `
-    );
+      );
+    }
   }
   return new SolanaLLMClient({ privateKey: result.privateKey });
 }
@@ -5752,6 +5840,9 @@ var ChatCompletions = class {
     this.apiUrl = apiUrl;
     this.timeout = timeout;
   }
+  client;
+  apiUrl;
+  timeout;
   async create(params) {
     if (params.stream) {
       return this.createStream(params);
@@ -5985,7 +6076,9 @@ var AnthropicClient = class {
   extractPaymentDetails,
   formatFundingMessageCompact,
   formatNeedsFundingMessage,
+  formatSolanaWalletMigrationNotice,
   formatWalletCreatedMessage,
+  formatWalletMigrationNotice,
   getCached,
   getCachedByRequest,
   getCostLogSummary,

package/dist/index.d.cts

@@ -2527,10 +2527,12 @@ declare function createWallet(): {
  */
 declare function saveWallet(privateKey: string): string;
 /**
- * Scan ~/.<dir>/wallet.json files from any provider (agentcash, etc.).
+ * Discover ~/.<dir>/wallet.json files from other providers.
  *
  * Each file should contain JSON with "privateKey" and "address" fields.
- * Results are sorted by modification time (most recent first).
+ * Results are sorted by modification time (most recent first). Discovery is
+ * intentionally opt-in: a provider wallet must never replace the canonical
+ * BlockRun wallet merely because it was written more recently.
  *
  * @returns Array of wallet objects with privateKey and address
  */
@@ -2542,22 +2544,37 @@ declare function scanWallets(): Array<{
  * Load wallet private key from file.
  *
  * Priority:
- * 1. Scan ~/.* /wallet.json (any provider)
- * 2. Legacy ~/.blockrun/.session
- * 3. Legacy ~/.blockrun/wallet.key
+ * 1. ~/.blockrun/.session
+ * 2. ~/.blockrun/wallet.key (legacy)
  *
  * @returns Private key string or null if not found
  */
 declare function loadWallet(): string | null;
+/**
+ * Warn when a new wallet was created while other provider wallets exist.
+ *
+ * Automatic selection deliberately ignores wallets discovered in other
+ * applications' directories, so a user who previously relied on that discovery
+ * would otherwise land on an empty wallet with no explanation of where their
+ * funds went. This notice names the discovered addresses and tells them how to
+ * import one on purpose.
+ *
+ * Addresses are derived from the discovered private key rather than read from
+ * the file's "address" field, so a file claiming an address it cannot sign for
+ * cannot trick the user into importing it.
+ *
+ * @param newAddress Address of the wallet that was just created
+ * @returns Formatted notice, or null if nothing was discovered
+ */
+declare function formatWalletMigrationNotice(newAddress: string): string | null;
 /**
  * Get existing wallet or create new one.
  *
  * Priority:
  * 1. BLOCKRUN_WALLET_KEY environment variable
- * 2. Scan wallet.json files from providers
- * 3. ~/.blockrun/.session file
- * 4. ~/.blockrun/wallet.key file - legacy
- * 5. Create new wallet
+ * 2. ~/.blockrun/.session file
+ * 3. ~/.blockrun/wallet.key file - legacy
+ * 4. Create new wallet
  *
  * @returns WalletInfo with address, privateKey, and isNew flag
  */
@@ -2821,11 +2838,12 @@ declare function solanaKeyToBytes(privateKey: string): Promise<Uint8Array>;
 declare function solanaPublicKey(privateKey: string): Promise<string>;
 declare function saveSolanaWallet(privateKey: string): string;
 /**
- * Scan ~/.<dir>/solana-wallet.json files from any provider.
+ * Discover ~/.<dir>/solana-wallet.json files from other providers.
  *
  * Each file should contain JSON with "privateKey" and "address" fields.
  * Also checks ~/.brcc/wallet.json for BRCC wallets.
- * Results are sorted by modification time (most recent first).
+ * Results are sorted by modification time (most recent first). Discovery is
+ * opt-in and never changes the active BlockRun wallet automatically.
  *
  * @returns Array of wallet objects with secretKey and publicKey
  */
@@ -2834,6 +2852,17 @@ declare function scanSolanaWallets(): Array<{
     publicKey: string;
 }>;
 declare function loadSolanaWallet(): string | null;
+/**
+ * Warn when a new Solana wallet was created while provider wallets exist.
+ *
+ * Solana counterpart of `formatWalletMigrationNotice`. Addresses are derived
+ * from the discovered secret key rather than trusted from the file's "address"
+ * field.
+ *
+ * @param newAddress Address of the wallet that was just created
+ * @returns Formatted notice, or null if nothing was discovered
+ */
+declare function formatSolanaWalletMigrationNotice(newAddress: string): Promise<string | null>;
 declare function getOrCreateSolanaWallet(): Promise<SolanaWalletInfo>;
 
 declare function getCached(key: string): unknown | null;
@@ -3104,4 +3133,4 @@ declare function validateTemperature(temperature?: number): void;
  */
 declare function validateTopP(topP?: number): void;
 
-export { APIError, AnthropicClient, type AudioModel, type AudioTrack, BASE_CHAIN_ID, type BarResolution, type BlockRunAnthropicOptions, BlockrunClient, type BlockrunClientOptions, BlockrunError, type CallInitiatedResponse, type CallModel, type CallOptions, type CallStatusResponse, type ChatChoice, type ChatCompletionOptions, type ChatMessage, type ChatOptions, type ChatResponse, type ChatResponseWithCost, type ChatUsage, type CostEntry, type CostEstimate, type CreatePaymentOptions, type FunctionCall, type FunctionDefinition, type HistoryOptions, ImageClient, type ImageClientOptions, type ImageData, type ImageEditOptions, type ImageGenerateOptions, type ImageModel, type ImageResponse, KNOWN_PROVIDERS, LLMClient, type LLMClientOptions, type ListOptions, type MarketSession, type Model, MusicClient, type MusicClientOptions, type MusicGenerateOptions, type MusicResponse, NETWORK_ALIASES, type NewsSearchSource, OpenAI, type OpenAIChatCompletionChoice, type OpenAIChatCompletionChunk, type OpenAIChatCompletionParams, type OpenAIChatCompletionResponse, type OpenAIClientOptions, PHONE_PRICES, PORTRAIT_ENROLLMENT_PRICE_USD, PaymentError, type PaymentLinks, type PhoneBuyOptions, type PhoneBuyResponse, PhoneClient, type PhoneClientOptions, type PhoneListResponse, type PhoneLookupResponse, type PhoneNumberRecord, type PhoneReleaseResponse, type PhoneRenewResponse, type PollOptions, PortraitClient, type PortraitClientOptions, type PortraitEnrollOptions, type PortraitEnrollResponse, type PriceBar, type PriceCategory, PriceClient, type PriceClientOptions, type PriceHistoryResponse, type PriceOptions, type PricePoint, RPC_PRICE_USD, type ResponseFormat, type RoutingDecision, type RoutingProfile, type RoutingTier, type RpcBatchRequest, RpcClient, type RpcClientOptions, type RpcError, type RpcNetwork, type RpcResponse, type RssSearchSource, SOLANA_NETWORK, SOLANA_WALLET_FILE as SOLANA_WALLET_FILE_PATH, SUPPORTED_NETWORKS, SearchClient, type SearchClientOptions, type SearchOptions, type SearchParameters, type SearchResult, type SearchSource, type SearchUsage, type SmartChatOptions, type SmartChatResponse, SolanaLLMClient, type SolanaLLMClientOptions, type SolanaWalletInfo, type SoundEffectOptions, type SpeechAudio, SpeechClient, type SpeechClientOptions, type SpeechGenerateOptions, type SpeechModel, type SpeechResponse, type SpeechVoice, type Spending, type SpendingReport, type StockMarket, SurfClient, type SurfClientOptions, type SymbolListResponse, type Tool, type ToolCall, type ToolChoice, USDC_BASE, USDC_BASE_CONTRACT, USDC_SOLANA, VideoClient, type VideoClientOptions, type VideoClip, type VideoGenerateOptions, type VideoModel, type VideoResponse, VoiceClient, type VoiceClientOptions, type VoiceInfo, type VoicePreset, WALLET_DIR_PATH, WALLET_FILE_PATH, type WalletInfo, type WebSearchSource, type XSearchSource, clearCache, createPaymentPayload, createSolanaPaymentPayload, createSolanaWallet, createWallet, LLMClient as default, extractPaymentDetails, formatFundingMessageCompact, formatNeedsFundingMessage, formatWalletCreatedMessage, getCached, getCachedByRequest, getCostLogSummary, getCostSummary, getEip681Uri, getOrCreateSolanaWallet, getOrCreateWallet, getPaymentLinks, getWalletAddress, loadSolanaWallet, loadWallet, logCost, parsePaymentRequired, saveSolanaWallet, saveToCache, saveWallet, scanSolanaWallets, scanWallets, setCache, setupAgentSolanaWallet, setupAgentWallet, solanaClient, solanaKeyToBytes, solanaPublicKey, status, validateMaxTokens, validateModel, validateTemperature, validateTopP };
+export { APIError, AnthropicClient, type AudioModel, type AudioTrack, BASE_CHAIN_ID, type BarResolution, type BlockRunAnthropicOptions, BlockrunClient, type BlockrunClientOptions, BlockrunError, type CallInitiatedResponse, type CallModel, type CallOptions, type CallStatusResponse, type ChatChoice, type ChatCompletionOptions, type ChatMessage, type ChatOptions, type ChatResponse, type ChatResponseWithCost, type ChatUsage, type CostEntry, type CostEstimate, type CreatePaymentOptions, type FunctionCall, type FunctionDefinition, type HistoryOptions, ImageClient, type ImageClientOptions, type ImageData, type ImageEditOptions, type ImageGenerateOptions, type ImageModel, type ImageResponse, KNOWN_PROVIDERS, LLMClient, type LLMClientOptions, type ListOptions, type MarketSession, type Model, MusicClient, type MusicClientOptions, type MusicGenerateOptions, type MusicResponse, NETWORK_ALIASES, type NewsSearchSource, OpenAI, type OpenAIChatCompletionChoice, type OpenAIChatCompletionChunk, type OpenAIChatCompletionParams, type OpenAIChatCompletionResponse, type OpenAIClientOptions, PHONE_PRICES, PORTRAIT_ENROLLMENT_PRICE_USD, PaymentError, type PaymentLinks, type PhoneBuyOptions, type PhoneBuyResponse, PhoneClient, type PhoneClientOptions, type PhoneListResponse, type PhoneLookupResponse, type PhoneNumberRecord, type PhoneReleaseResponse, type PhoneRenewResponse, type PollOptions, PortraitClient, type PortraitClientOptions, type PortraitEnrollOptions, type PortraitEnrollResponse, type PriceBar, type PriceCategory, PriceClient, type PriceClientOptions, type PriceHistoryResponse, type PriceOptions, type PricePoint, RPC_PRICE_USD, type ResponseFormat, type RoutingDecision, type RoutingProfile, type RoutingTier, type RpcBatchRequest, RpcClient, type RpcClientOptions, type RpcError, type RpcNetwork, type RpcResponse, type RssSearchSource, SOLANA_NETWORK, SOLANA_WALLET_FILE as SOLANA_WALLET_FILE_PATH, SUPPORTED_NETWORKS, SearchClient, type SearchClientOptions, type SearchOptions, type SearchParameters, type SearchResult, type SearchSource, type SearchUsage, type SmartChatOptions, type SmartChatResponse, SolanaLLMClient, type SolanaLLMClientOptions, type SolanaWalletInfo, type SoundEffectOptions, type SpeechAudio, SpeechClient, type SpeechClientOptions, type SpeechGenerateOptions, type SpeechModel, type SpeechResponse, type SpeechVoice, type Spending, type SpendingReport, type StockMarket, SurfClient, type SurfClientOptions, type SymbolListResponse, type Tool, type ToolCall, type ToolChoice, USDC_BASE, USDC_BASE_CONTRACT, USDC_SOLANA, VideoClient, type VideoClientOptions, type VideoClip, type VideoGenerateOptions, type VideoModel, type VideoResponse, VoiceClient, type VoiceClientOptions, type VoiceInfo, type VoicePreset, WALLET_DIR_PATH, WALLET_FILE_PATH, type WalletInfo, type WebSearchSource, type XSearchSource, clearCache, createPaymentPayload, createSolanaPaymentPayload, createSolanaWallet, createWallet, LLMClient as default, extractPaymentDetails, formatFundingMessageCompact, formatNeedsFundingMessage, formatSolanaWalletMigrationNotice, formatWalletCreatedMessage, formatWalletMigrationNotice, getCached, getCachedByRequest, getCostLogSummary, getCostSummary, getEip681Uri, getOrCreateSolanaWallet, getOrCreateWallet, getPaymentLinks, getWalletAddress, loadSolanaWallet, loadWallet, logCost, parsePaymentRequired, saveSolanaWallet, saveToCache, saveWallet, scanSolanaWallets, scanWallets, setCache, setupAgentSolanaWallet, setupAgentWallet, solanaClient, solanaKeyToBytes, solanaPublicKey, status, validateMaxTokens, validateModel, validateTemperature, validateTopP };

package/dist/index.d.ts

@@ -2527,10 +2527,12 @@ declare function createWallet(): {
  */
 declare function saveWallet(privateKey: string): string;
 /**
- * Scan ~/.<dir>/wallet.json files from any provider (agentcash, etc.).
+ * Discover ~/.<dir>/wallet.json files from other providers.
  *
  * Each file should contain JSON with "privateKey" and "address" fields.
- * Results are sorted by modification time (most recent first).
+ * Results are sorted by modification time (most recent first). Discovery is
+ * intentionally opt-in: a provider wallet must never replace the canonical
+ * BlockRun wallet merely because it was written more recently.
  *
  * @returns Array of wallet objects with privateKey and address
  */
@@ -2542,22 +2544,37 @@ declare function scanWallets(): Array<{
  * Load wallet private key from file.
  *
  * Priority:
- * 1. Scan ~/.* /wallet.json (any provider)
- * 2. Legacy ~/.blockrun/.session
- * 3. Legacy ~/.blockrun/wallet.key
+ * 1. ~/.blockrun/.session
+ * 2. ~/.blockrun/wallet.key (legacy)
  *
  * @returns Private key string or null if not found
  */
 declare function loadWallet(): string | null;
+/**
+ * Warn when a new wallet was created while other provider wallets exist.
+ *
+ * Automatic selection deliberately ignores wallets discovered in other
+ * applications' directories, so a user who previously relied on that discovery
+ * would otherwise land on an empty wallet with no explanation of where their
+ * funds went. This notice names the discovered addresses and tells them how to
+ * import one on purpose.
+ *
+ * Addresses are derived from the discovered private key rather than read from
+ * the file's "address" field, so a file claiming an address it cannot sign for
+ * cannot trick the user into importing it.
+ *
+ * @param newAddress Address of the wallet that was just created
+ * @returns Formatted notice, or null if nothing was discovered
+ */
+declare function formatWalletMigrationNotice(newAddress: string): string | null;
 /**
  * Get existing wallet or create new one.
  *
  * Priority:
  * 1. BLOCKRUN_WALLET_KEY environment variable
- * 2. Scan wallet.json files from providers
- * 3. ~/.blockrun/.session file
- * 4. ~/.blockrun/wallet.key file - legacy
- * 5. Create new wallet
+ * 2. ~/.blockrun/.session file
+ * 3. ~/.blockrun/wallet.key file - legacy
+ * 4. Create new wallet
  *
  * @returns WalletInfo with address, privateKey, and isNew flag
  */
@@ -2821,11 +2838,12 @@ declare function solanaKeyToBytes(privateKey: string): Promise<Uint8Array>;
 declare function solanaPublicKey(privateKey: string): Promise<string>;
 declare function saveSolanaWallet(privateKey: string): string;
 /**
- * Scan ~/.<dir>/solana-wallet.json files from any provider.
+ * Discover ~/.<dir>/solana-wallet.json files from other providers.
  *
  * Each file should contain JSON with "privateKey" and "address" fields.
  * Also checks ~/.brcc/wallet.json for BRCC wallets.
- * Results are sorted by modification time (most recent first).
+ * Results are sorted by modification time (most recent first). Discovery is
+ * opt-in and never changes the active BlockRun wallet automatically.
  *
  * @returns Array of wallet objects with secretKey and publicKey
  */
@@ -2834,6 +2852,17 @@ declare function scanSolanaWallets(): Array<{
     publicKey: string;
 }>;
 declare function loadSolanaWallet(): string | null;
+/**
+ * Warn when a new Solana wallet was created while provider wallets exist.
+ *
+ * Solana counterpart of `formatWalletMigrationNotice`. Addresses are derived
+ * from the discovered secret key rather than trusted from the file's "address"
+ * field.
+ *
+ * @param newAddress Address of the wallet that was just created
+ * @returns Formatted notice, or null if nothing was discovered
+ */
+declare function formatSolanaWalletMigrationNotice(newAddress: string): Promise<string | null>;
 declare function getOrCreateSolanaWallet(): Promise<SolanaWalletInfo>;
 
 declare function getCached(key: string): unknown | null;
@@ -3104,4 +3133,4 @@ declare function validateTemperature(temperature?: number): void;
  */
 declare function validateTopP(topP?: number): void;
 
-export { APIError, AnthropicClient, type AudioModel, type AudioTrack, BASE_CHAIN_ID, type BarResolution, type BlockRunAnthropicOptions, BlockrunClient, type BlockrunClientOptions, BlockrunError, type CallInitiatedResponse, type CallModel, type CallOptions, type CallStatusResponse, type ChatChoice, type ChatCompletionOptions, type ChatMessage, type ChatOptions, type ChatResponse, type ChatResponseWithCost, type ChatUsage, type CostEntry, type CostEstimate, type CreatePaymentOptions, type FunctionCall, type FunctionDefinition, type HistoryOptions, ImageClient, type ImageClientOptions, type ImageData, type ImageEditOptions, type ImageGenerateOptions, type ImageModel, type ImageResponse, KNOWN_PROVIDERS, LLMClient, type LLMClientOptions, type ListOptions, type MarketSession, type Model, MusicClient, type MusicClientOptions, type MusicGenerateOptions, type MusicResponse, NETWORK_ALIASES, type NewsSearchSource, OpenAI, type OpenAIChatCompletionChoice, type OpenAIChatCompletionChunk, type OpenAIChatCompletionParams, type OpenAIChatCompletionResponse, type OpenAIClientOptions, PHONE_PRICES, PORTRAIT_ENROLLMENT_PRICE_USD, PaymentError, type PaymentLinks, type PhoneBuyOptions, type PhoneBuyResponse, PhoneClient, type PhoneClientOptions, type PhoneListResponse, type PhoneLookupResponse, type PhoneNumberRecord, type PhoneReleaseResponse, type PhoneRenewResponse, type PollOptions, PortraitClient, type PortraitClientOptions, type PortraitEnrollOptions, type PortraitEnrollResponse, type PriceBar, type PriceCategory, PriceClient, type PriceClientOptions, type PriceHistoryResponse, type PriceOptions, type PricePoint, RPC_PRICE_USD, type ResponseFormat, type RoutingDecision, type RoutingProfile, type RoutingTier, type RpcBatchRequest, RpcClient, type RpcClientOptions, type RpcError, type RpcNetwork, type RpcResponse, type RssSearchSource, SOLANA_NETWORK, SOLANA_WALLET_FILE as SOLANA_WALLET_FILE_PATH, SUPPORTED_NETWORKS, SearchClient, type SearchClientOptions, type SearchOptions, type SearchParameters, type SearchResult, type SearchSource, type SearchUsage, type SmartChatOptions, type SmartChatResponse, SolanaLLMClient, type SolanaLLMClientOptions, type SolanaWalletInfo, type SoundEffectOptions, type SpeechAudio, SpeechClient, type SpeechClientOptions, type SpeechGenerateOptions, type SpeechModel, type SpeechResponse, type SpeechVoice, type Spending, type SpendingReport, type StockMarket, SurfClient, type SurfClientOptions, type SymbolListResponse, type Tool, type ToolCall, type ToolChoice, USDC_BASE, USDC_BASE_CONTRACT, USDC_SOLANA, VideoClient, type VideoClientOptions, type VideoClip, type VideoGenerateOptions, type VideoModel, type VideoResponse, VoiceClient, type VoiceClientOptions, type VoiceInfo, type VoicePreset, WALLET_DIR_PATH, WALLET_FILE_PATH, type WalletInfo, type WebSearchSource, type XSearchSource, clearCache, createPaymentPayload, createSolanaPaymentPayload, createSolanaWallet, createWallet, LLMClient as default, extractPaymentDetails, formatFundingMessageCompact, formatNeedsFundingMessage, formatWalletCreatedMessage, getCached, getCachedByRequest, getCostLogSummary, getCostSummary, getEip681Uri, getOrCreateSolanaWallet, getOrCreateWallet, getPaymentLinks, getWalletAddress, loadSolanaWallet, loadWallet, logCost, parsePaymentRequired, saveSolanaWallet, saveToCache, saveWallet, scanSolanaWallets, scanWallets, setCache, setupAgentSolanaWallet, setupAgentWallet, solanaClient, solanaKeyToBytes, solanaPublicKey, status, validateMaxTokens, validateModel, validateTemperature, validateTopP };
+export { APIError, AnthropicClient, type AudioModel, type AudioTrack, BASE_CHAIN_ID, type BarResolution, type BlockRunAnthropicOptions, BlockrunClient, type BlockrunClientOptions, BlockrunError, type CallInitiatedResponse, type CallModel, type CallOptions, type CallStatusResponse, type ChatChoice, type ChatCompletionOptions, type ChatMessage, type ChatOptions, type ChatResponse, type ChatResponseWithCost, type ChatUsage, type CostEntry, type CostEstimate, type CreatePaymentOptions, type FunctionCall, type FunctionDefinition, type HistoryOptions, ImageClient, type ImageClientOptions, type ImageData, type ImageEditOptions, type ImageGenerateOptions, type ImageModel, type ImageResponse, KNOWN_PROVIDERS, LLMClient, type LLMClientOptions, type ListOptions, type MarketSession, type Model, MusicClient, type MusicClientOptions, type MusicGenerateOptions, type MusicResponse, NETWORK_ALIASES, type NewsSearchSource, OpenAI, type OpenAIChatCompletionChoice, type OpenAIChatCompletionChunk, type OpenAIChatCompletionParams, type OpenAIChatCompletionResponse, type OpenAIClientOptions, PHONE_PRICES, PORTRAIT_ENROLLMENT_PRICE_USD, PaymentError, type PaymentLinks, type PhoneBuyOptions, type PhoneBuyResponse, PhoneClient, type PhoneClientOptions, type PhoneListResponse, type PhoneLookupResponse, type PhoneNumberRecord, type PhoneReleaseResponse, type PhoneRenewResponse, type PollOptions, PortraitClient, type PortraitClientOptions, type PortraitEnrollOptions, type PortraitEnrollResponse, type PriceBar, type PriceCategory, PriceClient, type PriceClientOptions, type PriceHistoryResponse, type PriceOptions, type PricePoint, RPC_PRICE_USD, type ResponseFormat, type RoutingDecision, type RoutingProfile, type RoutingTier, type RpcBatchRequest, RpcClient, type RpcClientOptions, type RpcError, type RpcNetwork, type RpcResponse, type RssSearchSource, SOLANA_NETWORK, SOLANA_WALLET_FILE as SOLANA_WALLET_FILE_PATH, SUPPORTED_NETWORKS, SearchClient, type SearchClientOptions, type SearchOptions, type SearchParameters, type SearchResult, type SearchSource, type SearchUsage, type SmartChatOptions, type SmartChatResponse, SolanaLLMClient, type SolanaLLMClientOptions, type SolanaWalletInfo, type SoundEffectOptions, type SpeechAudio, SpeechClient, type SpeechClientOptions, type SpeechGenerateOptions, type SpeechModel, type SpeechResponse, type SpeechVoice, type Spending, type SpendingReport, type StockMarket, SurfClient, type SurfClientOptions, type SymbolListResponse, type Tool, type ToolCall, type ToolChoice, USDC_BASE, USDC_BASE_CONTRACT, USDC_SOLANA, VideoClient, type VideoClientOptions, type VideoClip, type VideoGenerateOptions, type VideoModel, type VideoResponse, VoiceClient, type VoiceClientOptions, type VoiceInfo, type VoicePreset, WALLET_DIR_PATH, WALLET_FILE_PATH, type WalletInfo, type WebSearchSource, type XSearchSource, clearCache, createPaymentPayload, createSolanaPaymentPayload, createSolanaWallet, createWallet, LLMClient as default, extractPaymentDetails, formatFundingMessageCompact, formatNeedsFundingMessage, formatSolanaWalletMigrationNotice, formatWalletCreatedMessage, formatWalletMigrationNotice, getCached, getCachedByRequest, getCostLogSummary, getCostSummary, getEip681Uri, getOrCreateSolanaWallet, getOrCreateWallet, getPaymentLinks, getWalletAddress, loadSolanaWallet, loadWallet, logCost, parsePaymentRequired, saveSolanaWallet, saveToCache, saveWallet, scanSolanaWallets, scanWallets, setCache, setupAgentSolanaWallet, setupAgentWallet, solanaClient, solanaKeyToBytes, solanaPublicKey, status, validateMaxTokens, validateModel, validateTemperature, validateTopP };

package/dist/index.js

@@ -54,6 +54,16 @@ function createNonce() {
   crypto.getRandomValues(bytes);
   return `0x${Array.from(bytes).map((b) => b.toString(16).padStart(2, "0")).join("")}`;
 }
+var BLOCKRUN_SERVICE_CODE = "blockrun";
+function withBuilderCodeServiceCode(extensions) {
+  const merged = { ...extensions || {} };
+  const existing = merged["builder-code"] || {};
+  merged["builder-code"] = {
+    ...existing,
+    info: { ...existing.info || {}, s: [BLOCKRUN_SERVICE_CODE] }
+  };
+  return merged;
+}
 async function createPaymentPayload(privateKey, fromAddress, recipient, amount, network = "eip155:8453", options = {}) {
   const now = Math.floor(Date.now() / 1e3);
   const validAfter = now - 600;
@@ -101,7 +111,7 @@ async function createPaymentPayload(privateKey, fromAddress, recipient, amount,
         nonce
       }
     },
-    extensions: options.extensions || {}
+    extensions: withBuilderCodeServiceCode(options.extensions)
   };
   return btoa(JSON.stringify(paymentData));
 }
@@ -161,7 +171,7 @@ async function createSolanaPaymentPayload(secretKey, fromAddress, recipient, amo
     payload: {
       transaction: serializedTx
     },
-    extensions: options.extensions || {}
+    extensions: withBuilderCodeServiceCode(options.extensions)
   };
   return btoa(JSON.stringify(paymentData));
 }
@@ -4524,8 +4534,6 @@ function scanWallets() {
   return results.map(({ privateKey, address }) => ({ privateKey, address }));
 }
 function loadWallet() {
-  const wallets = scanWallets();
-  if (wallets.length > 0) return wallets[0].privateKey;
   if (fs2.existsSync(WALLET_FILE)) {
     const key = fs2.readFileSync(WALLET_FILE, "utf-8").trim();
     if (key) return key;
@@ -4537,6 +4545,44 @@ function loadWallet() {
   }
   return null;
 }
+function formatWalletMigrationNotice(newAddress) {
+  let discovered;
+  try {
+    discovered = scanWallets();
+  } catch {
+    return null;
+  }
+  const addresses = [];
+  for (const entry of discovered) {
+    try {
+      addresses.push(privateKeyToAccount14(entry.privateKey).address);
+    } catch {
+      continue;
+    }
+  }
+  if (addresses.length === 0) return null;
+  const found = addresses.map((addr) => `  ${addr}`).join("\n");
+  return `
+NOTICE: BlockRun created a new wallet, but also found existing wallet(s)
+belonging to other applications on this system:
+
+${found}
+
+BlockRun now uses only its own wallet:
+
+  ${newAddress}
+
+Discovered wallets are never adopted automatically \u2014 one may belong to a
+different application, or have been planted to make you fund an address you
+do not control.
+
+If an address above is yours and holds your USDC, import it deliberately:
+
+  export BLOCKRUN_WALLET_KEY=<private-key>
+
+or write that key to ~/.blockrun/.session
+`;
+}
 function getOrCreateWallet() {
   const envKey = typeof process !== "undefined" && process.env ? process.env.BLOCKRUN_WALLET_KEY || process.env.BASE_CHAIN_WALLET_KEY : void 0;
   if (envKey) {
@@ -4706,24 +4752,56 @@ function scanSolanaWallets() {
   return results.map(({ secretKey, publicKey }) => ({ secretKey, publicKey }));
 }
 function loadSolanaWallet() {
-  const wallets = scanSolanaWallets();
-  if (wallets.length > 0) return wallets[0].secretKey;
   if (fs3.existsSync(SOLANA_WALLET_FILE)) {
     const key = fs3.readFileSync(SOLANA_WALLET_FILE, "utf-8").trim();
     if (key) return key;
   }
   return null;
 }
+async function formatSolanaWalletMigrationNotice(newAddress) {
+  let discovered;
+  try {
+    discovered = scanSolanaWallets();
+  } catch {
+    return null;
+  }
+  const addresses = [];
+  for (const entry of discovered) {
+    try {
+      addresses.push(await solanaPublicKey(entry.secretKey));
+    } catch {
+      continue;
+    }
+  }
+  if (addresses.length === 0) return null;
+  const found = addresses.map((addr) => `  ${addr}`).join("\n");
+  return `
+NOTICE: BlockRun created a new Solana wallet, but also found existing
+wallet(s) belonging to other applications on this system:
+
+${found}
+
+BlockRun now uses only its own wallet:
+
+  ${newAddress}
+
+Discovered wallets are never adopted automatically \u2014 one may belong to a
+different application, or have been planted to make you fund an address you
+do not control.
+
+If an address above is yours and holds your USDC, import it deliberately:
+
+  export SOLANA_WALLET_KEY=<private-key>
+
+or write that key to ~/.blockrun/.solana-session
+`;
+}
 async function getOrCreateSolanaWallet() {
   const envKey = typeof process !== "undefined" && process.env ? process.env.SOLANA_WALLET_KEY : void 0;
   if (envKey) {
     const address2 = await solanaPublicKey(envKey);
     return { privateKey: envKey, address: address2, isNew: false };
   }
-  const wallets = scanSolanaWallets();
-  if (wallets.length > 0) {
-    return { privateKey: wallets[0].secretKey, address: wallets[0].publicKey, isNew: false };
-  }
   if (fs3.existsSync(SOLANA_WALLET_FILE)) {
     const fileKey = fs3.readFileSync(SOLANA_WALLET_FILE, "utf-8").trim();
     if (fileKey) {
@@ -5548,27 +5626,35 @@ function getCostLogSummary() {
 // src/setup.ts
 function setupAgentWallet(options) {
   const { address, privateKey, isNew } = getOrCreateWallet();
-  if (isNew && !options?.silent) {
-    console.error(
-      `
+  if (isNew) {
+    const notice = formatWalletMigrationNotice(address);
+    if (notice) console.error(notice);
+    if (!options?.silent) {
+      console.error(
+        `
 BlockRun Agent Wallet Created!
 Address: ${address}
 Send USDC on Base to get started.
 `
-    );
+      );
+    }
   }
   return new LLMClient({ privateKey });
 }
 async function setupAgentSolanaWallet(options) {
   const result = await getOrCreateSolanaWallet();
-  if (result.isNew && !options?.silent) {
-    console.error(
-      `
+  if (result.isNew) {
+    const notice = await formatSolanaWalletMigrationNotice(result.address);
+    if (notice) console.error(notice);
+    if (!options?.silent) {
+      console.error(
+        `
 BlockRun Solana Agent Wallet Created!
 Address: ${result.address}
 Send USDC on Solana to get started.
 `
-    );
+      );
+    }
   }
   return new SolanaLLMClient({ privateKey: result.privateKey });
 }
@@ -5645,6 +5731,9 @@ var ChatCompletions = class {
     this.apiUrl = apiUrl;
     this.timeout = timeout;
   }
+  client;
+  apiUrl;
+  timeout;
   async create(params) {
     if (params.stream) {
       return this.createStream(params);
@@ -5878,7 +5967,9 @@ export {
   extractPaymentDetails,
   formatFundingMessageCompact,
   formatNeedsFundingMessage,
+  formatSolanaWalletMigrationNotice,
   formatWalletCreatedMessage,
+  formatWalletMigrationNotice,
   getCached,
   getCachedByRequest,
   getCostLogSummary,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blockrun/llm",
-  "version": "3.6.1",
+  "version": "3.7.1",
   "type": "module",
   "description": "BlockRun SDK - Pay-per-request AI (LLM, Image, Video, Music, Voice) via x402 on Base and Solana",
   "main": "dist/index.cjs",