@finchtech/cli 0.1.0 → 0.2.1

package/dist/finch.js

@@ -3738,7 +3738,7 @@ var init_testnet_purchase_v1 = __esm({
     });
     testnetPurchaseTransactionResponseSchema = strictObjectSchema({
       operationId: canonicalUuidSchema,
-      chainId: { const: "84532" },
+      chainId: { type: "string", enum: ["84532", "8453"] },
       deploymentHash: hex32Schema,
       paymentTokenAddress: evmAddressSchema,
       totalPaidAtomic: positiveIntegerStringSchema,
@@ -28380,6 +28380,7 @@ function getAgentServiceDeployment(environment3) {
   );
   return Object.freeze({
     chainId: value.network.chainId,
+    networkName: value.network.name,
     protocolAddress: value.contracts.protocol,
     protocolImplementationAddress: value.contracts.protocolImplementation ?? null,
     protocolProxyAdminAddress: value.contracts.protocolProxyAdmin ?? null,
@@ -35825,7 +35826,17 @@ var init_public = __esm({
 });
 
 // ../../packages/skill-market-contracts/src/deployment.ts
-var environment2, deployment, delivery, SKILL_V3_SOURCE_COMMIT, SKILL_V3_CHAIN_ID, SKILL_V3_DEPLOYMENT_BLOCK, SKILL_V3_FACTORY_DEPLOYMENT_BLOCK, SKILL_V3_CHAIN_TAG, SKILL_V3_ADDRESSES, SKILL_V3_CHAIN_IDS;
+function skillV3SourceCommit(chainId) {
+  const selected = SKILL_V3_DEPLOYMENTS.find((candidate) => candidate.chainId === chainId);
+  if (selected === void 0) {
+    throw new TypeError(`Skill V3 is not deployed to chain ${chainId} in this environment.`);
+  }
+  return selected.sourceCommit;
+}
+function skillV3ChainTag(chainId) {
+  return getSkillDeliveryDeployment(environment2, chainId).chainTag;
+}
+var environment2, deployment, delivery, SKILL_V3_DEPLOYMENTS, SKILL_V3_CHAIN_IDS, SKILL_V3_CHAIN_ID, SKILL_V3_SOURCE_COMMIT, SKILL_V3_DEPLOYMENT_BLOCK, SKILL_V3_FACTORY_DEPLOYMENT_BLOCK, SKILL_V3_CHAIN_TAG, SKILL_V3_ADDRESSES;
 var init_deployment = __esm({
   "../../packages/skill-market-contracts/src/deployment.ts"() {
     "use strict";
@@ -35835,8 +35846,17 @@ var init_deployment = __esm({
     environment2 = resolveSkillProtocolEnvironment(process.env.FINCH_ENVIRONMENT);
     deployment = getSkillProtocolDeployment(environment2);
     delivery = getSkillDeliveryDeployment(environment2, deployment.chainId);
-    SKILL_V3_SOURCE_COMMIT = deployment.sourceCommit;
+    SKILL_V3_DEPLOYMENTS = Object.freeze(
+      getSkillProtocolChainIds(environment2).map((chainId) => {
+        const selected = getSkillProtocolDeployment(environment2, chainId);
+        return Object.freeze({ chainId, sourceCommit: selected.sourceCommit });
+      })
+    );
+    SKILL_V3_CHAIN_IDS = Object.freeze(
+      SKILL_V3_DEPLOYMENTS.map(({ chainId }) => chainId)
+    );
     SKILL_V3_CHAIN_ID = deployment.chainId;
+    SKILL_V3_SOURCE_COMMIT = skillV3SourceCommit(SKILL_V3_CHAIN_ID);
     SKILL_V3_DEPLOYMENT_BLOCK = BigInt(deployment.deploymentBlock);
     SKILL_V3_FACTORY_DEPLOYMENT_BLOCK = BigInt(deployment.factoryDeploymentBlock);
     SKILL_V3_CHAIN_TAG = delivery.chainTag;
@@ -35848,18 +35868,27 @@ var init_deployment = __esm({
       skillMarket: deployment.skillMarketAddress,
       feeRouter: deployment.feeRouterAddress
     });
-    SKILL_V3_CHAIN_IDS = getSkillProtocolChainIds(environment2);
   }
 });
 
 // ../../packages/skill-market-contracts/src/schemas.ts
+function authorityVariants(properties) {
+  return Object.freeze(SKILL_V3_DEPLOYMENTS.map(({ chainId, sourceCommit }) => strictObjectSchema3({
+    ...properties,
+    sourceCommit: { const: sourceCommit },
+    chainId: { const: chainId }
+  })));
+}
+function authorityObjectSchema(properties) {
+  return Object.freeze({ oneOf: authorityVariants(properties) });
+}
 function skillIntentConfirmationIdempotencyKey(chainId, transactionHash3) {
-  if (chainId !== 8453 && chainId !== 84532 || !/^0x[0-9a-f]{64}$/u.test(transactionHash3)) {
+  if (!SKILL_V3_CHAIN_IDS.includes(chainId) || !/^0x[0-9a-f]{64}$/u.test(transactionHash3)) {
     throw new TypeError("Skill confirmation identity is invalid.");
   }
   return `skill-intent-confirm:${chainId}:${transactionHash3}`;
 }
-var versionSchema, skillCategorySchema, nullableSkillCategorySchema, skillSigningAuthoritySchema, skillSourceKindSchema, skillContentModeSchema, skillListRequestSchema, skillDetailRequestSchema, skillDeliveryRequestSchema, skillPurchaseIntentRequestSchema, skillConvertIntentRequestSchema, skillPublicationPrepareRequestFields, skillPublicationPrepareRequestSchema, skillVersionPrepareRequestSchema, skillSetUnitPriceIntentRequestSchema, skillSetMaxSupplyIntentRequestSchema, skillDisplayCategoryUpdateRequestSchema, skillDisplayCategoryResponseSchema, sellStatusSchema, skillProjectionSchema, skillSearchProjectionSchema, skillListResponseSchema, skillLitDataSchema, skillDeliveryFields, skillDeliveryResponseSchema, intentResponseFields, skillBuyerIntentResponseSchema, skillSetUnitPriceIntentResponseSchema, skillSetMaxSupplyIntentResponseSchema, skillIntentResponseSchema, publishLocalActionSchema, versionLocalActionSchema, skillPublicationPrepareResponseSchema, skillVersionPrepareResponseSchema, nullableText, boundedTextList, skillPresentationSchema, skillDetailResponseSchema, skillManageRequestSchema, skillManageResponseSchema, skillPresentationPrepareRequestSchema, skillPresentationPrepareResponseSchema, skillAssetPrepareRequestSchema, skillAssetPrepareResponseSchema, skillIntentConfirmRequestSchema, skillIntentConfirmResponseSchema, skillErrorEnvelopeSchema;
+var versionSchema, skillChainIdSchema, skillCategorySchema, nullableSkillCategorySchema, skillSigningAuthoritySchema, skillSourceKindSchema, skillContentModeSchema, skillListRequestSchema, skillDetailRequestSchema, skillDeliveryRequestSchema, skillPurchaseIntentRequestSchema, skillConvertIntentRequestSchema, skillPublicationPrepareRequestFields, skillPublicationPrepareRequestSchema, skillVersionPrepareRequestSchema, skillSetUnitPriceIntentRequestSchema, skillSetMaxSupplyIntentRequestSchema, skillDisplayCategoryUpdateRequestSchema, skillDisplayCategoryResponseSchema, sellStatusSchema, skillProjectionSchema, skillSearchProjectionSchema, skillListResponseSchema, skillLitDataSchema, skillDeliveryFields, skillDeliveryResponseSchema, intentResponseFields, skillBuyerIntentResponseVariants, skillSetUnitPriceIntentResponseVariants, skillSetMaxSupplyIntentResponseVariants, skillIntentResponseSchema, publishLocalActionSchema, versionLocalActionSchema, skillPublicationPrepareResponseSchema, skillVersionPrepareResponseSchema, nullableText, boundedTextList, skillPresentationSchema, skillDetailResponseSchema, skillManageRequestSchema, skillManageResponseSchema, skillPresentationPrepareRequestSchema, skillPresentationPrepareResponseSchema, skillAssetPrepareRequestSchema, skillAssetPrepareResponseSchema, skillIntentConfirmRequestSchema, skillIntentConfirmResponseSchema, skillErrorEnvelopeSchema;
 var init_schemas4 = __esm({
   "../../packages/skill-market-contracts/src/schemas.ts"() {
     "use strict";
@@ -35868,6 +35897,7 @@ var init_schemas4 = __esm({
     init_public();
     init_public();
     versionSchema = { type: "integer", minimum: 1, maximum: 4294967295 };
+    skillChainIdSchema = { type: "integer", enum: SKILL_V3_CHAIN_IDS };
     skillCategorySchema = { type: "string", enum: SKILL_CATEGORIES };
     nullableSkillCategorySchema = { type: ["string", "null"], enum: [...SKILL_CATEGORIES, null] };
     skillSigningAuthoritySchema = strictObjectSchema3({
@@ -35891,25 +35921,30 @@ var init_schemas4 = __esm({
       cursor: { type: "string", minLength: 1, maxLength: 512, pattern: "^[A-Za-z0-9_-]+$" }
     }, []);
     skillDetailRequestSchema = strictObjectSchema3({
+      chainId: skillChainIdSchema,
       skillId: positiveIntegerStringSchema2,
       version: versionSchema
-    }, ["skillId"]);
+    }, ["chainId", "skillId"]);
     skillDeliveryRequestSchema = strictObjectSchema3({
+      chainId: skillChainIdSchema,
       skillId: positiveIntegerStringSchema2,
       version: versionSchema
     });
     skillPurchaseIntentRequestSchema = strictObjectSchema3({
+      chainId: skillChainIdSchema,
       skillId: positiveIntegerStringSchema2,
       version: versionSchema,
       quantity: positiveIntegerStringSchema2
     });
     skillConvertIntentRequestSchema = strictObjectSchema3({
+      chainId: skillChainIdSchema,
       skillId: positiveIntegerStringSchema2,
       fromVersion: versionSchema,
       toVersion: versionSchema,
       quantity: positiveIntegerStringSchema2
     });
     skillPublicationPrepareRequestFields = {
+      chainId: skillChainIdSchema,
       slug: { type: "string", minLength: 9, maxLength: 200, pattern: "^[a-z0-9]+(?:-[a-z0-9]+)*_finchip$" },
       name: { type: "string", minLength: 1, maxLength: 200 },
       category: skillCategorySchema,
@@ -35924,23 +35959,28 @@ var init_schemas4 = __esm({
     };
     skillPublicationPrepareRequestSchema = strictObjectSchema3(skillPublicationPrepareRequestFields);
     skillVersionPrepareRequestSchema = strictObjectSchema3({
+      chainId: skillChainIdSchema,
       skillId: positiveIntegerStringSchema2,
       sourceKind: skillSourceKindSchema,
       contentMode: skillContentModeSchema
     });
     skillSetUnitPriceIntentRequestSchema = strictObjectSchema3({
+      chainId: skillChainIdSchema,
       skillId: positiveIntegerStringSchema2,
       unitPrice: unsignedIntegerStringSchema
     });
     skillSetMaxSupplyIntentRequestSchema = strictObjectSchema3({
+      chainId: skillChainIdSchema,
       skillId: positiveIntegerStringSchema2,
       maxSupply: unsignedIntegerStringSchema
     });
     skillDisplayCategoryUpdateRequestSchema = strictObjectSchema3({
+      chainId: skillChainIdSchema,
       skillId: positiveIntegerStringSchema2,
       displayCategory: nullableSkillCategorySchema
     });
     skillDisplayCategoryResponseSchema = strictObjectSchema3({
+      chainId: skillChainIdSchema,
       skillId: positiveIntegerStringSchema2,
       declaredCategory: { type: "string", minLength: 1, maxLength: 100 },
       displayCategory: { type: ["string", "null"], minLength: 1, maxLength: 100 },
@@ -35953,7 +35993,7 @@ var init_schemas4 = __esm({
       supplyAvailable: { type: "boolean" }
     });
     skillProjectionSchema = strictObjectSchema3({
-      chainId: { const: SKILL_V3_CHAIN_ID },
+      chainId: skillChainIdSchema,
       skillId: positiveIntegerStringSchema2,
       slug: { type: "string" },
       name: { type: "string" },
@@ -35977,7 +36017,7 @@ var init_schemas4 = __esm({
       sellStatus: sellStatusSchema
     });
     skillSearchProjectionSchema = strictObjectSchema3({
-      chainId: { const: SKILL_V3_CHAIN_ID },
+      chainId: skillChainIdSchema,
       skillId: positiveIntegerStringSchema2,
       slug: { type: "string" },
       name: { type: "string" },
@@ -36012,7 +36052,7 @@ var init_schemas4 = __esm({
       chain: { type: "string", minLength: 1, maxLength: 100 }
     });
     skillDeliveryFields = {
-      chainId: { const: SKILL_V3_CHAIN_ID },
+      chainId: skillChainIdSchema,
       skillId: positiveIntegerStringSchema2,
       version: versionSchema,
       packageURI: { type: "string", minLength: 1, maxLength: 2e3 },
@@ -36023,28 +36063,26 @@ var init_schemas4 = __esm({
       strictObjectSchema3({ ...skillDeliveryFields, entitledWallet: addressSchema2, plaintext: { const: false }, litData: skillLitDataSchema })
     ] });
     intentResponseFields = {
-      sourceCommit: { const: SKILL_V3_SOURCE_COMMIT },
-      chainId: { const: SKILL_V3_CHAIN_ID },
       to: addressSchema2,
       data: { type: "string", pattern: "^0x(?:[0-9a-fA-F]{2})+$" },
       value: unsignedIntegerStringSchema,
       summary: { type: "string", minLength: 1, maxLength: 500 }
     };
-    skillBuyerIntentResponseSchema = strictObjectSchema3({
+    skillBuyerIntentResponseVariants = authorityVariants({
       kind: { type: "string", enum: ["purchase", "convert"] },
       ...intentResponseFields,
       walletAddress: addressSchema2,
       request: openObjectSchema2,
       signingAuthority: skillSigningAuthoritySchema
     });
-    skillSetUnitPriceIntentResponseSchema = strictObjectSchema3({
+    skillSetUnitPriceIntentResponseVariants = authorityVariants({
       kind: { const: "set_unit_price" },
       ...intentResponseFields,
       walletAddress: addressSchema2,
       request: skillSetUnitPriceIntentRequestSchema,
       signingAuthority: skillSigningAuthoritySchema
     });
-    skillSetMaxSupplyIntentResponseSchema = strictObjectSchema3({
+    skillSetMaxSupplyIntentResponseVariants = authorityVariants({
       kind: { const: "set_max_supply" },
       ...intentResponseFields,
       walletAddress: addressSchema2,
@@ -36052,9 +36090,9 @@ var init_schemas4 = __esm({
       signingAuthority: skillSigningAuthoritySchema
     });
     skillIntentResponseSchema = Object.freeze({ oneOf: [
-      skillBuyerIntentResponseSchema,
-      skillSetUnitPriceIntentResponseSchema,
-      skillSetMaxSupplyIntentResponseSchema
+      ...skillBuyerIntentResponseVariants,
+      ...skillSetUnitPriceIntentResponseVariants,
+      ...skillSetMaxSupplyIntentResponseVariants
     ] });
     publishLocalActionSchema = strictObjectSchema3({
       client: { const: "finch" },
@@ -36065,10 +36103,8 @@ var init_schemas4 = __esm({
       command: { const: "skill version-submit" },
       arguments: strictObjectSchema3({ skillId: positiveIntegerStringSchema2 })
     });
-    skillPublicationPrepareResponseSchema = strictObjectSchema3({
+    skillPublicationPrepareResponseSchema = authorityObjectSchema({
       kind: { const: "publish" },
-      sourceCommit: { const: SKILL_V3_SOURCE_COMMIT },
-      chainId: { const: SKILL_V3_CHAIN_ID },
       walletAddress: addressSchema2,
       signingAuthority: skillSigningAuthoritySchema,
       request: strictObjectSchema3({
@@ -36076,10 +36112,8 @@ var init_schemas4 = __esm({
       }),
       localAction: publishLocalActionSchema
     });
-    skillVersionPrepareResponseSchema = strictObjectSchema3({
+    skillVersionPrepareResponseSchema = authorityObjectSchema({
       kind: { const: "version" },
-      sourceCommit: { const: SKILL_V3_SOURCE_COMMIT },
-      chainId: { const: SKILL_V3_CHAIN_ID },
       walletAddress: addressSchema2,
       signingAuthority: skillSigningAuthoritySchema,
       skillId: positiveIntegerStringSchema2,
@@ -36139,7 +36173,10 @@ var init_schemas4 = __esm({
       ...skillProjectionSchema.properties,
       presentation: { oneOf: [{ type: "null" }, skillPresentationSchema] }
     });
-    skillManageRequestSchema = strictObjectSchema3({ skillId: positiveIntegerStringSchema2 });
+    skillManageRequestSchema = strictObjectSchema3({
+      chainId: skillChainIdSchema,
+      skillId: positiveIntegerStringSchema2
+    });
     skillManageResponseSchema = strictObjectSchema3({
       skill: skillProjectionSchema,
       contentMode: skillContentModeSchema,
@@ -36147,13 +36184,12 @@ var init_schemas4 = __esm({
       presentation: { oneOf: [{ type: "null" }, skillPresentationSchema] }
     });
     skillPresentationPrepareRequestSchema = strictObjectSchema3({
+      chainId: skillChainIdSchema,
       skillId: positiveIntegerStringSchema2,
       presentation: skillPresentationSchema
     });
-    skillPresentationPrepareResponseSchema = strictObjectSchema3({
+    skillPresentationPrepareResponseSchema = authorityObjectSchema({
       kind: { const: "presentation" },
-      sourceCommit: { const: SKILL_V3_SOURCE_COMMIT },
-      chainId: { const: SKILL_V3_CHAIN_ID },
       walletAddress: addressSchema2,
       signingAuthority: skillSigningAuthoritySchema,
       skillId: positiveIntegerStringSchema2,
@@ -36167,13 +36203,12 @@ var init_schemas4 = __esm({
       })
     });
     skillAssetPrepareRequestSchema = strictObjectSchema3({
+      chainId: skillChainIdSchema,
       skillId: positiveIntegerStringSchema2,
       assetKind: { const: "cover" }
     });
-    skillAssetPrepareResponseSchema = strictObjectSchema3({
+    skillAssetPrepareResponseSchema = authorityObjectSchema({
       kind: { const: "asset_upload" },
-      sourceCommit: { const: SKILL_V3_SOURCE_COMMIT },
-      chainId: { const: SKILL_V3_CHAIN_ID },
       walletAddress: addressSchema2,
       skillId: positiveIntegerStringSchema2,
       assetKind: { const: "cover" },
@@ -36192,14 +36227,18 @@ var init_schemas4 = __esm({
       })
     });
     skillIntentConfirmRequestSchema = strictObjectSchema3({
-      chainId: { type: "integer", enum: [8453, 84532] },
+      chainId: skillChainIdSchema,
       transactionHash: transactionHashSchema2
     });
     skillIntentConfirmResponseSchema = strictObjectSchema3({
       status: { type: "string", enum: ["projected", "indexing_pending"] }
     });
     skillErrorEnvelopeSchema = strictObjectSchema3({
-      error: strictObjectSchema3({ code: { type: "string" }, message: { type: "string" } })
+      error: strictObjectSchema3({
+        code: { type: "string" },
+        message: { type: "string" },
+        traceId: { type: "string", minLength: 1, maxLength: 128, pattern: "^[A-Za-z0-9_-]+$" }
+      })
     });
   }
 });
@@ -36387,7 +36426,21 @@ function parseRemoteError(response, value) {
   }
   return envelope;
 }
-var import_ajv, CLI_MERCHANT_OPERATION_IDS, CliHttpError, ajv, validatorCache, AgentCliHttpClient;
+function parseSkillRemoteError(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) throw new TypeError("Skill error envelope is invalid.");
+  const error51 = value.error;
+  if (error51 === null || typeof error51 !== "object" || Array.isArray(error51)) throw new TypeError("Skill error envelope is invalid.");
+  const candidate = error51;
+  if (typeof candidate.code !== "string" || candidate.code.length < 1 || typeof candidate.message !== "string" || candidate.message.length < 1 || candidate.traceId !== void 0 && (typeof candidate.traceId !== "string" || !/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/u.test(candidate.traceId))) {
+    throw new TypeError("Skill error envelope is invalid.");
+  }
+  return Object.freeze({ error: Object.freeze({
+    code: candidate.code,
+    message: candidate.message,
+    ...candidate.traceId === void 0 ? {} : { traceId: candidate.traceId }
+  }) });
+}
+var import_ajv, CLI_MERCHANT_OPERATION_IDS, CliHttpError, ajv, validatorCache, oauthAuthorizationResponseSchema, oauthErrorResponseSchema, AgentCliHttpClient;
 var init_api2 = __esm({
   "src/api.ts"() {
     "use strict";
@@ -36433,6 +36486,29 @@ var init_api2 = __esm({
     ajv.addFormat("date-time", (value) => Number.isFinite(Date.parse(value)));
     ajv.addFormat("uri", (value) => URL.canParse(value));
     validatorCache = /* @__PURE__ */ new WeakMap();
+    oauthAuthorizationResponseSchema = {
+      type: "object",
+      additionalProperties: false,
+      required: ["authorized", "accountId", "walletAddress", "clientName", "scopes", "callbackUrl"],
+      properties: {
+        authorized: { const: true },
+        accountId: { type: "string", format: "uuid" },
+        walletAddress: { type: "string", pattern: "^0x[0-9a-f]{40}$" },
+        clientName: { type: "string", minLength: 1, maxLength: 128 },
+        scopes: { type: "array", minItems: 1, uniqueItems: true, items: { type: "string", minLength: 1 } },
+        callbackUrl: { type: "string", format: "uri" }
+      }
+    };
+    oauthErrorResponseSchema = {
+      type: "object",
+      additionalProperties: false,
+      required: ["error", "error_description"],
+      properties: {
+        error: { type: "string", minLength: 1 },
+        error_description: { type: "string", minLength: 1 },
+        trace_id: { type: "string", format: "uuid" }
+      }
+    };
     AgentCliHttpClient = class {
       origin;
       fetchImplementation;
@@ -36500,8 +36576,13 @@ var init_api2 = __esm({
           throw new CliHttpError("CLI_REMOTE_UNAVAILABLE", null, { cause });
         }
         if (response.status !== expectedStatus) {
-          await readBoundedJson(response).catch(() => null);
-          throw new CliHttpError("CLI_REMOTE_UNAVAILABLE", response.status);
+          try {
+            const envelope = parseSkillRemoteError(await readBoundedJson(response));
+            throw new CliHttpError("CLI_REMOTE_UNAVAILABLE", response.status, { envelope });
+          } catch (cause) {
+            if (cause instanceof CliHttpError) throw cause;
+            throw new CliHttpError("CLI_RESPONSE_INVALID", response.status, { cause });
+          }
         }
         return response;
       }
@@ -36527,6 +36608,24 @@ var init_api2 = __esm({
           throw new CliHttpError("CLI_RESPONSE_INVALID", challenge2.status);
         }
         await challenge2.body?.cancel().catch(() => void 0);
+        const resourceResponse = await this.publicFetch("/.well-known/oauth-protected-resource");
+        if (resourceResponse.status !== 200) {
+          await resourceResponse.body?.cancel().catch(() => void 0);
+          throw new CliHttpError("CLI_REMOTE_UNAVAILABLE", resourceResponse.status);
+        }
+        const resource = jsonObject(await readBoundedJson(resourceResponse));
+        if (resource.resource !== `${this.origin}/` || JSON.stringify(resource.authorization_servers) !== JSON.stringify([this.origin])) {
+          throw new CliHttpError("CLI_RESPONSE_INVALID", resourceResponse.status);
+        }
+        const authorizationResponse = await this.publicFetch("/.well-known/oauth-authorization-server");
+        if (authorizationResponse.status !== 200) {
+          await authorizationResponse.body?.cancel().catch(() => void 0);
+          throw new CliHttpError("CLI_REMOTE_UNAVAILABLE", authorizationResponse.status);
+        }
+        const authorization = jsonObject(await readBoundedJson(authorizationResponse));
+        if (authorization.issuer !== this.origin || authorization.authorization_endpoint !== `${this.origin}/oauth/authorize` || authorization.token_endpoint !== `${this.origin}/oauth/token` || authorization.registration_endpoint !== `${this.origin}/oauth/register` || JSON.stringify(authorization.response_types_supported) !== JSON.stringify(["code"]) || JSON.stringify(authorization.grant_types_supported) !== JSON.stringify(["authorization_code", "refresh_token"]) || JSON.stringify(authorization.token_endpoint_auth_methods_supported) !== JSON.stringify(["none"]) || JSON.stringify(authorization.code_challenge_methods_supported) !== JSON.stringify(["S256"])) {
+          throw new CliHttpError("CLI_RESPONSE_INVALID", authorizationResponse.status);
+        }
         const manifestResponse = await this.publicFetch("/mcp/client-compatibility.json");
         if (manifestResponse.status !== 200) {
           await manifestResponse.body?.cancel().catch(() => void 0);
@@ -36539,15 +36638,16 @@ var init_api2 = __esm({
           throw new CliHttpError("CLI_RESPONSE_INVALID", manifestResponse.status);
         }
         const client = jsonObject(manifest.clients[0]);
-        const handoff = jsonObject(client.handoff);
+        const install = jsonObject(client.install);
+        const authorize = jsonObject(client.authorize);
         const verify = jsonObject(client.verify);
-        if (manifest.schemaVersion !== 2 || manifest.manifestId !== "finch.remote-mcp-clients" || mcp.serverName !== "finch" || mcp.url !== mcpUrl || mcp.transport !== "streamable_http" || mcp.authorization !== "agent_cli_session_handoff" || source.repository !== "https://github.com/FinchipAI/Finch-Site" || source.path !== "apps/mcp/src/client-compatibility.ts" || client.id !== "codex" || client.supportLevel !== "verified" || handoff.kind !== "finch_cli" || handoff.executable !== "finch" || JSON.stringify(handoff.arguments) !== JSON.stringify(["mcp", "launch", "codex"]) || verify.kind !== "harness_ui" || verify.surface !== "mcp_tools" || client.reload !== "new_session") {
+        if (manifest.schemaVersion !== 3 || manifest.manifestId !== "finch.remote-mcp-clients" || mcp.serverName !== "finch" || mcp.url !== mcpUrl || mcp.transport !== "streamable_http" || mcp.authorization !== "oauth" || source.repository !== "https://github.com/FinchipAI/Finch-Site" || source.path !== "apps/mcp/src/client-compatibility.ts" || client.id !== "codex" || client.supportLevel !== "verified" || install.kind !== "native_cli" || install.executable !== "codex" || JSON.stringify(install.arguments) !== JSON.stringify(["mcp", "add", "finch", "--url", mcpUrl]) || authorize.kind !== "native_cli" || authorize.executable !== "codex" || JSON.stringify(authorize.arguments) !== JSON.stringify(["mcp", "login", "finch"]) || verify.kind !== "harness_ui" || verify.surface !== "mcp_tools" || client.reload !== "new_session") {
           throw new CliHttpError("CLI_RESPONSE_INVALID", manifestResponse.status);
         }
         return Object.freeze({
           url: mcpUrl,
           transport: "streamable_http",
-          authorization: "agent_cli_session_handoff",
+          authorization: "oauth",
           compatibilityManifestUrl,
           supportedClients: Object.freeze(["codex"])
         });
@@ -36577,10 +36677,10 @@ var init_api2 = __esm({
           body: JSON.stringify(body)
         }));
       }
-      async resolveSkillId(slug, bearer) {
+      async resolveSkillId(chainId, slug, bearer) {
         let response;
         try {
-          response = await this.fetchImplementation(`${this.origin}/api/skills/resolve?${new URLSearchParams({ slug })}`, {
+          response = await this.fetchImplementation(`${this.origin}/api/skills/resolve?${new URLSearchParams({ chainId: String(chainId), slug })}`, {
             method: "GET",
             headers: { authorization: `Bearer ${bearer}` },
             redirect: "error",
@@ -36594,15 +36694,20 @@ var init_api2 = __esm({
           return null;
         }
         if (response.status !== 200) {
-          await readBoundedJson(response).catch(() => null);
-          throw new CliHttpError("CLI_REMOTE_UNAVAILABLE", response.status);
+          try {
+            const envelope = parseSkillRemoteError(await readBoundedJson(response));
+            throw new CliHttpError("CLI_REMOTE_UNAVAILABLE", response.status, { envelope });
+          } catch (cause) {
+            if (cause instanceof CliHttpError) throw cause;
+            throw new CliHttpError("CLI_RESPONSE_INVALID", response.status, { cause });
+          }
         }
         const body = await readBoundedJson(response);
         if (typeof body?.skillId !== "string" || !/^[1-9][0-9]*$/u.test(body.skillId)) throw new CliHttpError("CLI_RESPONSE_INVALID", 200);
         return body.skillId;
       }
-      async readSkillCurrentVersion(skillId, bearer) {
-        const response = await this.skillFetch(`/api/skills/resolve?${new URLSearchParams({ skillId })}`, {
+      async readSkillCurrentVersion(chainId, skillId, bearer) {
+        const response = await this.skillFetch(`/api/skills/resolve?${new URLSearchParams({ chainId: String(chainId), skillId })}`, {
           method: "GET",
           headers: { authorization: `Bearer ${bearer}` },
           cache: "no-store"
@@ -36615,7 +36720,7 @@ var init_api2 = __esm({
         const response = await this.skillFetch("/api/skills/content-key", {
           method: "POST",
           headers: { authorization: `Bearer ${input.bearer}`, "content-type": "application/json" },
-          body: JSON.stringify({ skillId: input.skillId, version: input.version, wallet: input.wallet, message: input.message, signature: input.signature })
+          body: JSON.stringify({ chainId: input.chainId, skillId: input.skillId, version: input.version, wallet: input.wallet, message: input.message, signature: input.signature })
         });
         const body = await readBoundedJson(response);
         if (body.scheme === "FINCHIP_V2" && typeof body.key === "string" && /^0x[0-9a-fA-F]{64}$/u.test(body.key) && body.contentKey === null) return Object.freeze({ scheme: body.scheme, key: body.key, contentKey: null });
@@ -36632,6 +36737,7 @@ var init_api2 = __esm({
             "content-type": "application/json"
           },
           body: JSON.stringify({
+            chainId: input.chainId,
             skillId: input.skillId,
             version: input.version,
             contentKey: input.contentKey
@@ -36651,24 +36757,36 @@ var init_api2 = __esm({
         });
         return readBoundedBytes(response, 1, 10 * 1024 * 1024);
       }
-      async confirmSkillProjection(transactionHash3, bearer) {
+      async confirmSkillProjection(chainId, transactionHash3, bearer) {
         let response;
         try {
           response = await this.fetchImplementation(`${this.origin}/api/skills/projection`, {
             method: "POST",
             redirect: "error",
             headers: { authorization: `Bearer ${bearer}`, "content-type": "application/json" },
-            body: JSON.stringify({ transactionHash: transactionHash3 })
+            body: JSON.stringify({ chainId, transactionHash: transactionHash3 })
           });
         } catch {
           return "indexing_pending";
         }
         if (response.status !== 200 && response.status !== 202) {
-          await response.body?.cancel().catch(() => void 0);
-          return "indexing_pending";
+          try {
+            const envelope = parseSkillRemoteError(await readBoundedJson(response));
+            throw new CliHttpError("CLI_REMOTE_UNAVAILABLE", response.status, { envelope });
+          } catch (cause) {
+            if (cause instanceof CliHttpError) throw cause;
+            throw new CliHttpError("CLI_RESPONSE_INVALID", response.status, { cause });
+          }
+        }
+        let body;
+        try {
+          body = await readBoundedJson(response);
+        } catch (cause) {
+          throw new CliHttpError("CLI_RESPONSE_INVALID", response.status, { cause });
         }
-        const body = await readBoundedJson(response).catch(() => null);
-        return body?.status === "projected" ? "projected" : "indexing_pending";
+        if (response.status === 200 && body?.status === "projected") return "projected";
+        if (response.status === 202 && body?.status === "indexing_pending") return "indexing_pending";
+        throw new CliHttpError("CLI_RESPONSE_INVALID", response.status);
       }
       getSession(bearer) {
         const operation4 = IDENTITY_V1_OPERATIONS.session;
@@ -36680,6 +36798,26 @@ var init_api2 = __esm({
           bearer
         });
       }
+      authorizeMcp(requestPath, bearer) {
+        let parsed;
+        try {
+          parsed = new URL(requestPath, this.origin);
+        } catch {
+          throw new TypeError("MCP authorization request path is invalid.");
+        }
+        if (parsed.origin !== this.origin || parsed.pathname !== "/oauth/authorize" || parsed.hash !== "" || requestPath !== `${parsed.pathname}${parsed.search}` || parsed.search === "") {
+          throw new TypeError("MCP authorization request path is invalid.");
+        }
+        return this.request({
+          method: "post",
+          path: requestPath,
+          successStatus: 200,
+          responseSchema: oauthAuthorizationResponseSchema,
+          statusOnlyErrorSchema: oauthErrorResponseSchema,
+          bearer,
+          body: {}
+        });
+      }
       createChallenge(input) {
         const operation4 = IDENTITY_V1_OPERATIONS.challenge;
         return this.request({
@@ -37592,6 +37730,11 @@ function integer2(value, name, minimum = 1) {
   if (!Number.isInteger(value) || Number(value) < minimum || Number(value) > 4294967295) throw new TypeError(`${name} is invalid.`);
   return Number(value);
 }
+function skillChain(value, name = "Skill chain") {
+  const chainId = integer2(value, name);
+  if (!SKILL_V3_CHAIN_IDS.includes(chainId)) throw new TypeError(`${name} is not deployed in this environment.`);
+  return chainId;
+}
 function deliveryPackageUri(value) {
   return string4(value, "Skill package URI", IPFS);
 }
@@ -37615,10 +37758,12 @@ function assertPublicationAuthority(authority, context) {
   return authority;
 }
 function assertAuthority(plan, kind, walletAddress2, requiresSigning = true) {
-  if (plan.kind !== kind || plan.sourceCommit !== SKILL_V3_SOURCE_COMMIT || plan.chainId !== SKILL_V3_CHAIN_ID || typeof plan.walletAddress !== "string" || plan.walletAddress.toLowerCase() !== walletAddress2.toLowerCase()) {
-    throw new TypeError("Skill local-action authority does not match the active TEST wallet and deployment.");
+  const chainId = skillChain(plan.chainId);
+  if (plan.kind !== kind || plan.sourceCommit !== skillV3SourceCommit(chainId) || typeof plan.walletAddress !== "string" || plan.walletAddress.toLowerCase() !== walletAddress2.toLowerCase()) {
+    throw new TypeError("Skill local-action authority does not match the active wallet and deployment.");
   }
   if (requiresSigning) signingAuthority(plan.signingAuthority, walletAddress2);
+  return chainId;
 }
 function assertLocalAction(value, command, skillId) {
   const action = object4(value, "Skill local action");
@@ -37633,9 +37778,9 @@ function assertLocalAction(value, command, skillId) {
 function intent(value, walletAddress2) {
   const parsed = object4(value, "Skill intent");
   exact(parsed, ["chainId", "to", "data", "value", "summary", "signingAuthority"], "Skill intent");
-  if (parsed.chainId !== SKILL_V3_CHAIN_ID) throw new TypeError("Skill intent chain is invalid.");
+  const chainId = skillChain(parsed.chainId, "Skill intent chain");
   return Object.freeze({
-    chainId: SKILL_V3_CHAIN_ID,
+    chainId,
     to: string4(parsed.to, "Skill intent target", /^0x[0-9a-fA-F]{40}$/u),
     data: string4(parsed.data, "Skill intent calldata", /^0x(?:[0-9a-fA-F]{2})+$/u),
     value: string4(parsed.value, "Skill intent value", DECIMAL),
@@ -37643,6 +37788,11 @@ function intent(value, walletAddress2) {
     signingAuthority: signingAuthority(parsed.signingAuthority, walletAddress2)
   });
 }
+function legacyIntent(value, walletAddress2, authority) {
+  const prepared = object4(value, "Skill legacy intent");
+  exact(prepared, ["chainId", "to", "data", "value", "summary"], "Skill legacy intent");
+  return intent({ ...prepared, signingAuthority: authority }, walletAddress2);
+}
 async function readPublishablePath(inputPath) {
   const root = resolve2(inputPath);
   const rootStat = await lstat2(root);
@@ -37679,10 +37829,11 @@ function contentMode(value) {
 function publishPlan(value, context) {
   const plan = object4(value, "Skill publish plan");
   exact(plan, ["kind", "sourceCommit", "chainId", "walletAddress", "signingAuthority", "request", "localAction"], "Skill publish plan");
-  assertAuthority(plan, "publish", context.walletAddress);
+  const chainId = assertAuthority(plan, "publish", context.walletAddress);
   assertLocalAction(plan.localAction, "skill publish-submit");
   const request = object4(plan.request, "Skill publish request");
-  exact(request, ["slug", "name", "category", "licenseTypeName", "imageURI", "sourceKind", "contentMode", "unitPrice", "maxSupply", "royaltyBPS", "usageLimit"], "Skill publish request");
+  exact(request, ["chainId", "slug", "name", "category", "licenseTypeName", "imageURI", "sourceKind", "contentMode", "unitPrice", "maxSupply", "royaltyBPS", "usageLimit"], "Skill publish request");
+  if (request.chainId !== chainId) throw new TypeError("Skill publish request chain is invalid.");
   string4(request.slug, "Skill slug");
   string4(request.name, "Skill name");
   string4(request.category, "Skill category");
@@ -37697,6 +37848,7 @@ function publishPlan(value, context) {
   string4(request.usageLimit, "Skill usageLimit", DECIMAL);
   if (!Number.isInteger(request.royaltyBPS) || Number(request.royaltyBPS) < 0 || Number(request.royaltyBPS) > 1e3) throw new TypeError("Skill royaltyBPS is invalid.");
   return {
+    chainId,
     request,
     signingAuthority: assertPublicationAuthority(signingAuthority(plan.signingAuthority, context.walletAddress), context)
   };
@@ -37704,14 +37856,15 @@ function publishPlan(value, context) {
 function versionPlan(value, context) {
   const plan = object4(value, "Skill version plan");
   exact(plan, ["kind", "sourceCommit", "chainId", "walletAddress", "signingAuthority", "skillId", "currentVersion", "nextVersion", "currentManifestURI", "sourceKind", "contentMode", "localAction"], "Skill version plan");
-  assertAuthority(plan, "version", context.walletAddress);
+  const chainId = assertAuthority(plan, "version", context.walletAddress);
   const skillId = string4(plan.skillId, "Skill id", /^[1-9][0-9]*$/u);
   assertLocalAction(plan.localAction, "skill version-submit", skillId);
-  const request = { skillId, sourceKind: sourceKind(plan.sourceKind), contentMode: contentMode(plan.contentMode) };
+  const request = { chainId, skillId, sourceKind: sourceKind(plan.sourceKind), contentMode: contentMode(plan.contentMode) };
   const currentVersion = integer2(plan.currentVersion, "Current version");
   const nextVersion = integer2(plan.nextVersion, "Next version");
   if (nextVersion !== currentVersion + 1) throw new TypeError("Skill version plan does not advance exactly one version.");
   return {
+    chainId,
     request,
     currentVersion,
     nextVersion,
@@ -37724,13 +37877,14 @@ function versionPlan(value, context) {
 function managePlan(value, walletAddress2, kind) {
   const plan = object4(value, `Skill ${kind} plan`);
   exact(plan, ["kind", "sourceCommit", "chainId", "to", "data", "value", "summary", "walletAddress", "signingAuthority", "request"], `Skill ${kind} plan`);
-  assertAuthority(plan, kind === "price" ? "set_unit_price" : "set_max_supply", walletAddress2);
+  const chainId = assertAuthority(plan, kind === "price" ? "set_unit_price" : "set_max_supply", walletAddress2);
   const request = object4(plan.request, `Skill ${kind} request`);
   const field = kind === "price" ? "unitPrice" : "maxSupply";
-  exact(request, ["skillId", field], `Skill ${kind} request`);
+  exact(request, ["chainId", "skillId", field], `Skill ${kind} request`);
+  if (request.chainId !== chainId) throw new TypeError(`Skill ${kind} request chain is invalid.`);
   string4(request.skillId, "Skill id", /^[1-9][0-9]*$/u);
   string4(request[field], `Skill ${field}`, DECIMAL);
-  return { request, intent: intent({
+  return { chainId, request, intent: intent({
     chainId: plan.chainId,
     to: plan.to,
     data: plan.data,
@@ -37753,14 +37907,16 @@ function presentationPlan(value, walletAddress2) {
     "presentation",
     "localAction"
   ], "Skill presentation plan");
-  assertAuthority(plan, "presentation", walletAddress2);
+  const chainId = assertAuthority(plan, "presentation", walletAddress2);
   const skillId = string4(plan.skillId, "Skill id", /^[1-9][0-9]*$/u);
   assertLocalAction(plan.localAction, "skill presentation-submit", skillId);
   return {
+    chainId,
     skillId,
     currentVersion: integer2(plan.currentVersion, "Current version"),
     currentManifestURI: string4(plan.currentManifestURI, "Current manifest URI", IPFS),
-    presentation: buildPresentation(plan.presentation)
+    presentation: buildPresentation(plan.presentation),
+    signingAuthority: signingAuthority(plan.signingAuthority, walletAddress2)
   };
 }
 function assetPlan(value, walletAddress2) {
@@ -37776,7 +37932,7 @@ function assetPlan(value, walletAddress2) {
     "maxBytes",
     "localAction"
   ], "Skill asset plan");
-  assertAuthority(plan, "asset_upload", walletAddress2, false);
+  const chainId = assertAuthority(plan, "asset_upload", walletAddress2, false);
   const skillId = string4(plan.skillId, "Skill id", /^[1-9][0-9]*$/u);
   if (plan.assetKind !== "cover" || plan.maxBytes !== 5242880) throw new TypeError("Skill cover authority is invalid.");
   const accepted = plan.acceptedMediaTypes;
@@ -37790,7 +37946,7 @@ function assetPlan(value, walletAddress2) {
   if (action.client !== "finch" || action.command !== "skill asset-upload" || args.assetKind !== "cover") {
     throw new TypeError("Skill cover local action is invalid.");
   }
-  return { skillId, acceptedMediaTypes: accepted, maxBytes: plan.maxBytes };
+  return { chainId, skillId, acceptedMediaTypes: accepted, maxBytes: plan.maxBytes };
 }
 function coverMediaType(bytes) {
   const png = [137, 80, 78, 71, 13, 10, 26, 10];
@@ -37807,9 +37963,7 @@ function isPlaintextSkillDelivery(value) {
 function deliveryPlan(value, context) {
   const delivery2 = object4(value, "Skill delivery");
   exact(delivery2, ["chainId", "skillId", "version", "packageURI", "packageHash", "plaintext", "litData", "entitledWallet"], "Skill delivery");
-  if (delivery2.chainId !== SKILL_V3_CHAIN_ID) {
-    throw new TypeError("Skill delivery authority is invalid.");
-  }
+  const chainId = skillChain(delivery2.chainId, "Skill delivery chain");
   const skillId = string4(delivery2.skillId, "Skill id", /^[1-9][0-9]*$/u);
   const version6 = integer2(delivery2.version, "Skill version");
   const packageHash = string4(delivery2.packageHash, "Skill package hash", HASH);
@@ -37817,16 +37971,16 @@ function deliveryPlan(value, context) {
   const packageURI = deliveryPackageUri(delivery2.packageURI);
   if (delivery2.plaintext) {
     if (delivery2.litData !== null || delivery2.entitledWallet !== null) throw new TypeError("Plaintext Skill delivery cannot contain wallet or Lit authority.");
-    return { skillId, version: version6, packageURI, packageHash, plaintext: true, litData: null };
+    return { chainId, skillId, version: version6, packageURI, packageHash, plaintext: true, litData: null };
   }
   if (context === null || typeof delivery2.entitledWallet !== "string" || !/^0x[0-9a-fA-F]{40}$/u.test(delivery2.entitledWallet) || delivery2.entitledWallet.toLowerCase() !== context.walletAddress.toLowerCase()) {
-    throw new TypeError("Protected Skill delivery is not entitled to the active TEST wallet.");
+    throw new TypeError("Protected Skill delivery is not entitled to the active wallet.");
   }
   const litData = object4(delivery2.litData, "Skill Lit data");
   exact(litData, ["ciphertext", "scheme", "chain"], "Skill Lit data");
-  if (litData.scheme !== SKILL_V3_ENVELOPE_SCHEME && litData.scheme !== SKILL_V3_LIT_ENVELOPE_SCHEME || litData.chain !== SKILL_V3_CHAIN_TAG) throw new TypeError("Skill Lit data does not match the source-controlled deployment.");
+  if (litData.scheme !== SKILL_V3_ENVELOPE_SCHEME && litData.scheme !== SKILL_V3_LIT_ENVELOPE_SCHEME || litData.chain !== skillV3ChainTag(chainId)) throw new TypeError("Skill Lit data does not match the source-controlled deployment.");
   string4(litData.ciphertext, "Skill Lit ciphertext");
-  return { skillId, version: version6, packageURI, packageHash, plaintext: false, litData };
+  return { chainId, skillId, version: version6, packageURI, packageHash, plaintext: false, litData };
 }
 function required3(value, name) {
   if (value === void 0 || value === null) throw new TypeError(`${name} is unavailable.`);
@@ -37841,10 +37995,12 @@ function recoveryReceipt(value, name) {
     blockNumber: receipt.blockNumber === null ? null : string4(receipt.blockNumber, `${name} block number`, /^[1-9][0-9]*$/u)
   });
 }
-function recoveryRequest(value, action, name) {
+function recoveryRequest(value, action, name, chainId) {
   const request = object4(value, name);
-  if (request.action !== action) throw new TypeError(`${name} action is invalid.`);
-  return request;
+  if (request.action !== action || request.chainId !== void 0 && request.chainId !== chainId) {
+    throw new TypeError(`${name} authority is invalid.`);
+  }
+  return { ...request, chainId };
 }
 function canonical(value) {
   if (Array.isArray(value)) return `[${value.map(canonical).join(",")}]`;
@@ -37852,7 +38008,15 @@ function canonical(value) {
   return JSON.stringify(value);
 }
 function recoveryFingerprint2(kind, plan, walletAddress2) {
-  return createHash2("sha256").update(canonical({ kind, plan, walletAddress: walletAddress2.toLowerCase(), chainId: SKILL_V3_CHAIN_ID, sourceCommit: SKILL_V3_SOURCE_COMMIT })).digest("hex");
+  const authority = object4(plan, "Skill recovery plan");
+  const chainId = skillChain(authority.chainId, "Skill recovery plan chain");
+  return createHash2("sha256").update(canonical({
+    kind,
+    plan,
+    walletAddress: walletAddress2.toLowerCase(),
+    chainId,
+    sourceCommit: skillV3SourceCommit(chainId)
+  })).digest("hex");
 }
 function recoveryJournal(value, fingerprint2, kind, context) {
   const journal = object4(value, "Skill publication recovery");
@@ -37876,7 +38040,8 @@ function recoveryJournal(value, fingerprint2, kind, context) {
     "requests",
     "receipts"
   ], "Skill publication recovery");
-  if (journal.version !== 4 || journal.kind !== kind || journal.fingerprint !== fingerprint2 || !/^[0-9a-f]{64}$/u.test(fingerprint2) || journal.chainId !== SKILL_V3_CHAIN_ID || typeof journal.walletAddress !== "string" || journal.walletAddress.toLowerCase() !== context.walletAddress.toLowerCase()) throw new TypeError("Skill publication recovery authority does not match this command.");
+  const chainId = skillChain(journal.chainId, "Skill recovery chain");
+  if (journal.version !== 4 || journal.kind !== kind || journal.fingerprint !== fingerprint2 || !/^[0-9a-f]{64}$/u.test(fingerprint2) || typeof journal.walletAddress !== "string" || journal.walletAddress.toLowerCase() !== context.walletAddress.toLowerCase()) throw new TypeError("Skill publication recovery authority does not match this command.");
   const recoveredAuthority = assertPublicationAuthority(
     signingAuthority(journal.signingAuthority, context.walletAddress),
     context
@@ -37897,9 +38062,9 @@ function recoveryJournal(value, fingerprint2, kind, context) {
   exact(requests, ["primary", "uri", "lit"], "Skill recovery requests");
   const receipts = object4(journal.receipts, "Skill recovery receipts");
   exact(receipts, ["primary", "uri", "lit"], "Skill recovery receipts");
-  const primary = recoveryRequest(requests.primary, kind === "publish" ? "createSkill" : "updateSkill", "Skill primary recovery request");
-  const uri = requests.uri === null ? null : recoveryRequest(requests.uri, "setSkillURI", "Skill URI recovery request");
-  const lit = requests.lit === null ? null : recoveryRequest(requests.lit, "setLitData", "Skill Lit recovery request");
+  const primary = recoveryRequest(requests.primary, kind === "publish" ? "createSkill" : "updateSkill", "Skill primary recovery request", chainId);
+  const uri = requests.uri === null ? null : recoveryRequest(requests.uri, "setSkillURI", "Skill URI recovery request", chainId);
+  const lit = requests.lit === null ? null : recoveryRequest(requests.lit, "setLitData", "Skill Lit recovery request", chainId);
   const parsedReceipts = {
     primary: recoveryReceipt(receipts.primary, "Skill primary recovery receipt"),
     uri: recoveryReceipt(receipts.uri, "Skill URI recovery receipt"),
@@ -37951,13 +38116,13 @@ var init_skill_local_flow = __esm({
       pause;
       nonce;
       recovery;
-      async send(context, action, request, prepared, onBroadcast) {
+      async send(context, action, request, prepared, authority, onBroadcast) {
         return required3(this.sender.submitPrepared, "Skill prepared-intent sender").call(this.sender, {
           privateKey: context.privateKey,
           walletAddress: context.walletAddress,
           action,
           request,
-          intent: intent(prepared, context.walletAddress),
+          intent: authority === void 0 ? intent(prepared, context.walletAddress) : legacyIntent(prepared, context.walletAddress, authority),
           onBroadcast
         });
       }
@@ -37971,10 +38136,18 @@ var init_skill_local_flow = __esm({
         string4(uri, "Skill package URI", IPFS);
         return required3(this.api.fetchSkillStoredContent, "Skill content relay").call(this.api, uri, bearer);
       }
-      async contentKey(context, skillId, version6) {
-        const message = buildKeyRequestMessage({ chainId: SKILL_V3_CHAIN_ID, skillId: BigInt(skillId), version: version6 }, context.walletAddress, this.nonce());
+      async contentKey(context, chainId, skillId, version6) {
+        const message = buildKeyRequestMessage({ chainId, skillId: BigInt(skillId), version: version6 }, context.walletAddress, this.nonce());
         const signature = await this.signer.signMessage({ privateKey: context.privateKey, message });
-        const result2 = await required3(this.api.requestSkillContentKey, "Skill content-key request").call(this.api, { skillId, version: version6, wallet: context.walletAddress, message, signature, bearer: context.bearer });
+        const result2 = await required3(this.api.requestSkillContentKey, "Skill content-key request").call(this.api, {
+          chainId,
+          skillId,
+          version: version6,
+          wallet: context.walletAddress,
+          message,
+          signature,
+          bearer: context.bearer
+        });
         if (result2.scheme === SKILL_V3_ENVELOPE_SCHEME) {
           return Object.freeze({ scheme: result2.scheme, key: string4(result2.key, "Skill key-encryption key", HASH) });
         }
@@ -38001,32 +38174,35 @@ var init_skill_local_flow = __esm({
           excluded: sealed.excluded
         });
       }
-      async protectedEnvelope(context, skillId, version6, mode, packageContentKey) {
+      async protectedEnvelope(context, chainId, skillId, version6, mode, packageContentKey) {
         if (mode === "finchip_v2") {
-          const wrapping = await this.contentKey(context, skillId, version6);
+          const wrapping = await this.contentKey(context, chainId, skillId, version6);
           if (wrapping.scheme !== SKILL_V3_ENVELOPE_SCHEME) {
             throw new TypeError("Finch key authority returned the wrong envelope scheme.");
           }
           return {
             action: "setLitData",
+            chainId,
             skillId,
             version: version6,
             ciphertext: await sealEnvelope(wrapping.key, packageContentKey),
             scheme: SKILL_V3_ENVELOPE_SCHEME,
-            chain: SKILL_V3_CHAIN_TAG
+            chain: skillV3ChainTag(chainId)
           };
         }
         const sealed = await required3(this.api.sealSkillContentKeyWithLit, "Skill Lit sealing").call(this.api, {
+          chainId,
           skillId,
           version: version6,
           contentKey: packageContentKey,
           bearer: context.bearer
         });
-        if (sealed.scheme !== SKILL_V3_LIT_ENVELOPE_SCHEME || sealed.chain !== SKILL_V3_CHAIN_TAG) {
+        if (sealed.scheme !== SKILL_V3_LIT_ENVELOPE_SCHEME || sealed.chain !== skillV3ChainTag(chainId)) {
           throw new TypeError("Skill Lit sealing authority is invalid.");
         }
         return {
           action: "setLitData",
+          chainId,
           skillId,
           version: version6,
           ciphertext: string4(sealed.ciphertext, "Skill Lit ciphertext"),
@@ -38047,24 +38223,31 @@ var init_skill_local_flow = __esm({
       async save(fingerprint2, journal) {
         await required3(this.recovery, "Skill publication recovery").saveSkillPublicationRecovery(fingerprint2, journal);
       }
-      async project(transactionHash3, bearer) {
-        await this.api.confirmSkillProjection?.(transactionHash3, bearer);
+      async project(chainId, transactionHash3, bearer) {
+        await this.api.confirmSkillProjection?.(chainId, transactionHash3, bearer);
       }
       async stage(context, fingerprint2, journal, stage, action, request, prepare) {
         const existing = journal.receipts[stage];
         if (existing !== null) {
           journal.receipts[stage] = await this.verify(context, action, request, existing);
           await this.save(fingerprint2, journal);
-          await this.project(journal.receipts[stage].transactionHash, context.bearer);
+          await this.project(journal.chainId, journal.receipts[stage].transactionHash, context.bearer);
           return;
         }
         const prepared = await prepare();
-        journal.receipts[stage] = await this.send(context, action, request, prepared, async ({ transactionHash: transactionHash3 }) => {
-          journal.receipts[stage] = { transactionHash: transactionHash3, blockNumber: null };
-          await this.save(fingerprint2, journal);
-        });
+        journal.receipts[stage] = await this.send(
+          context,
+          action,
+          request,
+          prepared,
+          journal.signingAuthority,
+          async ({ transactionHash: transactionHash3 }) => {
+            journal.receipts[stage] = { transactionHash: transactionHash3, blockNumber: null };
+            await this.save(fingerprint2, journal);
+          }
+        );
         await this.save(fingerprint2, journal);
-        await this.project(journal.receipts[stage].transactionHash, context.bearer);
+        await this.project(journal.chainId, journal.receipts[stage].transactionHash, context.bearer);
       }
       async recoverPublication(fingerprint2, context) {
         if (!/^[0-9a-f]{64}$/u.test(fingerprint2)) throw new TypeError("Skill publication recovery fingerprint is invalid.");
@@ -38087,7 +38270,12 @@ var init_skill_local_flow = __esm({
           const slug = string4(journal.requests.primary.slug, "Skill recovery slug");
           let skillId2 = journal.skillId;
           await this.settle(async () => {
-            skillId2 = await required3(this.api.resolveSkillId, "Skill resolve API").call(this.api, slug, context.bearer);
+            skillId2 = await required3(this.api.resolveSkillId, "Skill resolve API").call(
+              this.api,
+              journal.chainId,
+              slug,
+              context.bearer
+            );
             return skillId2 !== null;
           }, `Skill ${slug} publication`);
           if (skillId2 === null) throw new TypeError("Published Skill slug did not resolve.");
@@ -38097,6 +38285,7 @@ var init_skill_local_flow = __esm({
             if (journal.requests.lit === null) {
               journal.requests.lit = await this.protectedEnvelope(
                 context,
+                journal.chainId,
                 skillId2,
                 1,
                 journal.contentMode,
@@ -38117,6 +38306,7 @@ var init_skill_local_flow = __esm({
           }
           await store.clearSkillPublicationRecovery(fingerprint2);
           return {
+            chainId: journal.chainId,
             skillId: skillId2,
             version: 1,
             contentMode: journal.contentMode,
@@ -38141,7 +38331,12 @@ var init_skill_local_flow = __esm({
           () => required3(this.api.requestSkillIntent, "Skill intent API").call(this.api, journal.requests.primary, context.bearer)
         );
         await this.settle(
-          async () => await required3(this.api.readSkillCurrentVersion, "Skill version API").call(this.api, skillId, context.bearer) === journal.targetVersion,
+          async () => await required3(this.api.readSkillCurrentVersion, "Skill version API").call(
+            this.api,
+            journal.chainId,
+            skillId,
+            context.bearer
+          ) === journal.targetVersion,
           `Skill ${skillId} version ${journal.targetVersion}`
         );
         const uriRequest = required3(journal.requests.uri, "Skill URI recovery request");
@@ -38158,6 +38353,7 @@ var init_skill_local_flow = __esm({
           if (journal.requests.lit === null) {
             journal.requests.lit = await this.protectedEnvelope(
               context,
+              journal.chainId,
               skillId,
               journal.targetVersion,
               journal.contentMode,
@@ -38178,6 +38374,7 @@ var init_skill_local_flow = __esm({
         }
         await store.clearSkillPublicationRecovery(fingerprint2);
         return {
+          chainId: journal.chainId,
           skillId,
           version: journal.targetVersion,
           contentMode: journal.contentMode,
@@ -38239,7 +38436,7 @@ var init_skill_local_flow = __esm({
             kind: "publish",
             fingerprint: fingerprint2,
             walletAddress: context.walletAddress.toLowerCase(),
-            chainId: SKILL_V3_CHAIN_ID,
+            chainId: plan.chainId,
             signingAuthority: plan.signingAuthority,
             sourceKind: expectedSourceKind,
             contentMode: mode,
@@ -38267,7 +38464,12 @@ var init_skill_local_flow = __esm({
         );
         let skillId = journal.skillId;
         await this.settle(async () => {
-          skillId = await required3(this.api.resolveSkillId, "Skill resolve API").call(this.api, String(request.slug), context.bearer);
+          skillId = await required3(this.api.resolveSkillId, "Skill resolve API").call(
+            this.api,
+            journal.chainId,
+            String(request.slug),
+            context.bearer
+          );
           return skillId !== null;
         }, `Skill ${request.slug} publication`);
         if (skillId === null) throw new TypeError("Published Skill slug did not resolve.");
@@ -38277,6 +38479,7 @@ var init_skill_local_flow = __esm({
           if (journal.requests.lit === null) {
             journal.requests.lit = await this.protectedEnvelope(
               context,
+              journal.chainId,
               skillId,
               1,
               journal.contentMode,
@@ -38296,14 +38499,19 @@ var init_skill_local_flow = __esm({
           );
         }
         await store.clearSkillPublicationRecovery(fingerprint2);
-        return { skillId, version: 1, contentMode: journal.contentMode, packageHash: journal.packageHash, excluded: journal.excluded, transactions: { create: required3(journal.receipts.primary, "Skill create receipt").transactionHash, ...journal.contentMode === "plaintext" ? {} : { setLitData: required3(journal.receipts.lit, "Skill Lit receipt").transactionHash } } };
+        return { chainId: journal.chainId, skillId, version: 1, contentMode: journal.contentMode, packageHash: journal.packageHash, excluded: journal.excluded, transactions: { create: required3(journal.receipts.primary, "Skill create receipt").transactionHash, ...journal.contentMode === "plaintext" ? {} : { setLitData: required3(journal.receipts.lit, "Skill Lit receipt").transactionHash } } };
       }
       async publishVersion(path, planValue, context) {
         const plan = versionPlan(planValue, context);
         const fingerprint2 = recoveryFingerprint2("version", planValue, context.walletAddress);
         const store = required3(this.recovery, "Skill publication recovery");
         const prior = await store.readSkillPublicationRecovery(fingerprint2);
-        const observedVersion = await required3(this.api.readSkillCurrentVersion, "Skill version API").call(this.api, String(plan.request.skillId), context.bearer);
+        const observedVersion = await required3(this.api.readSkillCurrentVersion, "Skill version API").call(
+          this.api,
+          plan.chainId,
+          String(plan.request.skillId),
+          context.bearer
+        );
         if (prior === null && observedVersion !== plan.currentVersion) {
           throw new TypeError(`Skill current version ${observedVersion} no longer matches plan version ${plan.currentVersion}.`);
         }
@@ -38336,14 +38544,14 @@ var init_skill_local_flow = __esm({
             bearer: context.bearer,
             objectKind: "manifest"
           });
-          const updateRequest = { action: "updateSkill", skillId: plan.request.skillId, mdHash: packaged.packageHash, packageHash: packaged.packageHash };
-          const uriRequest2 = { action: "setSkillURI", skillId: plan.request.skillId, packageURI: manifestURI };
+          const updateRequest = { action: "updateSkill", chainId: plan.chainId, skillId: plan.request.skillId, mdHash: packaged.packageHash, packageHash: packaged.packageHash };
+          const uriRequest2 = { action: "setSkillURI", chainId: plan.chainId, skillId: plan.request.skillId, packageURI: manifestURI };
           journal = {
             version: 4,
             kind: "version",
             fingerprint: fingerprint2,
             walletAddress: context.walletAddress.toLowerCase(),
-            chainId: SKILL_V3_CHAIN_ID,
+            chainId: plan.chainId,
             signingAuthority: plan.signingAuthority,
             sourceKind: plan.sourceKind,
             contentMode: plan.contentMode,
@@ -38369,7 +38577,12 @@ var init_skill_local_flow = __esm({
           journal.requests.primary,
           () => required3(this.api.requestSkillIntent, "Skill intent API").call(this.api, journal.requests.primary, context.bearer)
         );
-        await this.settle(async () => await required3(this.api.readSkillCurrentVersion, "Skill version API").call(this.api, String(plan.request.skillId), context.bearer) === plan.nextVersion, `Skill ${plan.request.skillId} version ${plan.nextVersion}`);
+        await this.settle(async () => await required3(this.api.readSkillCurrentVersion, "Skill version API").call(
+          this.api,
+          journal.chainId,
+          String(plan.request.skillId),
+          context.bearer
+        ) === plan.nextVersion, `Skill ${plan.request.skillId} version ${plan.nextVersion}`);
         const uriRequest = required3(journal.requests.uri, "Skill URI recovery request");
         await this.stage(
           context,
@@ -38384,6 +38597,7 @@ var init_skill_local_flow = __esm({
           if (journal.requests.lit === null) {
             journal.requests.lit = await this.protectedEnvelope(
               context,
+              journal.chainId,
               String(plan.request.skillId),
               plan.nextVersion,
               journal.contentMode,
@@ -38403,18 +38617,18 @@ var init_skill_local_flow = __esm({
           );
         }
         await store.clearSkillPublicationRecovery(fingerprint2);
-        return { skillId: plan.request.skillId, version: plan.nextVersion, contentMode: journal.contentMode, packageHash: journal.packageHash, excluded: journal.excluded, transactions: { update: required3(journal.receipts.primary, "Skill update receipt").transactionHash, setSkillURI: required3(journal.receipts.uri, "Skill URI receipt").transactionHash, ...journal.contentMode === "plaintext" ? {} : { setLitData: required3(journal.receipts.lit, "Skill Lit receipt").transactionHash } } };
+        return { chainId: journal.chainId, skillId: plan.request.skillId, version: plan.nextVersion, contentMode: journal.contentMode, packageHash: journal.packageHash, excluded: journal.excluded, transactions: { update: required3(journal.receipts.primary, "Skill update receipt").transactionHash, setSkillURI: required3(journal.receipts.uri, "Skill URI receipt").transactionHash, ...journal.contentMode === "plaintext" ? {} : { setLitData: required3(journal.receipts.lit, "Skill Lit receipt").transactionHash } } };
       }
       async manage(kind, planValue, context) {
         const plan = managePlan(planValue, context.walletAddress, kind);
         const action = kind === "price" ? "setUnitPrice" : "setMaxSupply";
         const submission = await this.send(context, action, { action, ...plan.request }, plan.intent);
-        await this.project(submission.transactionHash, context.bearer);
-        return { ...submission, skillId: plan.request.skillId, kind };
+        await this.project(plan.chainId, submission.transactionHash, context.bearer);
+        return { ...submission, chainId: plan.chainId, skillId: plan.request.skillId, kind };
       }
       async publishPresentation(planValue, context) {
         const plan = presentationPlan(planValue, context.walletAddress);
-        const liveVersion = await required3(this.api.readSkillCurrentVersion, "Skill version API").call(this.api, plan.skillId, context.bearer);
+        const liveVersion = await required3(this.api.readSkillCurrentVersion, "Skill version API").call(this.api, plan.chainId, plan.skillId, context.bearer);
         if (liveVersion !== plan.currentVersion) {
           throw new TypeError(`Skill current version ${liveVersion} no longer matches presentation plan version ${plan.currentVersion}.`);
         }
@@ -38427,11 +38641,17 @@ var init_skill_local_flow = __esm({
           bearer: context.bearer,
           objectKind: "manifest"
         });
-        const request = { action: "setSkillURI", skillId: plan.skillId, packageURI: manifestURI };
+        const request = { action: "setSkillURI", chainId: plan.chainId, skillId: plan.skillId, packageURI: manifestURI };
         const prepared = await required3(this.api.requestSkillIntent, "Skill intent API").call(this.api, request, context.bearer);
-        const submission = await this.send(context, "setSkillURI", request, prepared);
-        await this.project(submission.transactionHash, context.bearer);
-        return { ...submission, skillId: plan.skillId, currentVersion: plan.currentVersion, manifestURI };
+        const submission = await this.send(
+          context,
+          "setSkillURI",
+          request,
+          prepared,
+          plan.signingAuthority
+        );
+        await this.project(plan.chainId, submission.transactionHash, context.bearer);
+        return { ...submission, chainId: plan.chainId, skillId: plan.skillId, currentVersion: plan.currentVersion, manifestURI };
       }
       async uploadCover(path, planValue, context) {
         const plan = assetPlan(planValue, context.walletAddress);
@@ -38451,7 +38671,7 @@ var init_skill_local_flow = __esm({
           objectKind: "cover",
           mediaType
         });
-        return { skillId: plan.skillId, assetKind: "cover", uri, mediaType, bytes: bytes.byteLength };
+        return { chainId: plan.chainId, skillId: plan.skillId, assetKind: "cover", uri, mediaType, bytes: bytes.byteLength };
       }
       async download(planValue, context) {
         const plan = deliveryPlan(planValue, context);
@@ -38468,7 +38688,12 @@ var init_skill_local_flow = __esm({
         if (!HASH.test(expectedHash)) throw new TypeError("Skill delivery has no verifiable plaintext package hash.");
         let plaintext = stored;
         if (!plan.plaintext) {
-          const resolved = await this.contentKey(required3(context, "Protected Skill wallet context"), plan.skillId, plan.version);
+          const resolved = await this.contentKey(
+            required3(context, "Protected Skill wallet context"),
+            plan.chainId,
+            plan.skillId,
+            plan.version
+          );
           const envelopeScheme = String(plan.litData.scheme);
           if (resolved.scheme !== envelopeScheme) throw new TypeError("Skill content-key response does not match its on-chain envelope.");
           const contentKey = resolved.scheme === SKILL_V3_ENVELOPE_SCHEME ? await openEnvelope(resolved.key, String(plan.litData.ciphertext)) : resolved.key;
@@ -38476,7 +38701,7 @@ var init_skill_local_flow = __esm({
         }
         const actualHash = await sha256Hex(plaintext);
         if (actualHash.toLowerCase() !== expectedHash.toLowerCase()) throw new TypeError("Decrypted Skill package hash does not match its published authority.");
-        return Object.freeze({ bytes: plaintext, skillId: plan.skillId, version: plan.version, packageHash: actualHash });
+        return Object.freeze({ bytes: plaintext, chainId: plan.chainId, skillId: plan.skillId, version: plan.version, packageHash: actualHash });
       }
     };
   }
@@ -38857,7 +39082,6 @@ var init_application = __esm({
       taskProtocolSender;
       skillIntentSender;
       skillLocalFlow;
-      mcpHarness;
       browserLauncher;
       constructor(dependencies) {
         this.api = dependencies.api;
@@ -38872,7 +39096,6 @@ var init_application = __esm({
         this.taskProtocolSender = dependencies.taskProtocolSender;
         this.skillIntentSender = dependencies.skillIntentSender;
         this.skillLocalFlow = dependencies.skillLocalFlow;
-        this.mcpHarness = dependencies.mcpHarness;
         this.browserLauncher = dependencies.browserLauncher;
       }
       async authorizedProfile() {
@@ -39052,11 +39275,11 @@ var init_application = __esm({
         await required4(this.state.activateSession, "state.activateSession").call(this.state, response);
         return response;
       }
-      async browserHandoffAuthority() {
+      async verifiedAgentCliAuthority() {
         const profile = await this.authorizedProfile();
         const session = await this.networkSession(profile);
         const wallet = await required4(this.state.readWalletAddress, "state.readWalletAddress").call(this.state);
-        const remote = asObject(await required4(this.api.getSession, "api.getSession").call(this.api, session.rawBearer), "Browser handoff Session");
+        const remote = asObject(await required4(this.api.getSession, "api.getSession").call(this.api, session.rawBearer), "AgentCLI Session");
         if (session.walletAddress.toLowerCase() !== wallet.walletAddress.toLowerCase() || remote.accountId !== session.accountId || String(remote.walletAddress).toLowerCase() !== wallet.walletAddress.toLowerCase() || remote.environment !== profile.environment || remote.audience !== "agent_cli") {
           throw new CliAuthorityError();
         }
@@ -39081,7 +39304,7 @@ var init_application = __esm({
         });
       }
       async openSite() {
-        const authority = await this.browserHandoffAuthority();
+        const authority = await this.verifiedAgentCliAuthority();
         return this.openBrowserHandoff(authority);
       }
       async loginSite(requestUrl) {
@@ -39096,9 +39319,67 @@ var init_application = __esm({
         if (parsed.origin !== profile.origin || requestUrl !== `${profile.origin}${parsed.pathname}` || parsed.search !== "" || parsed.hash !== "" || match === null) {
           throw new TypeError("Browser login request origin or path does not match the active profile origin.");
         }
-        const authority = await this.browserHandoffAuthority();
+        const authority = await this.verifiedAgentCliAuthority();
         return this.openBrowserHandoff({ ...authority, requestId: match[1] });
       }
+      async authorizeMcp(requestUrl) {
+        const profile = await this.authorizedProfile();
+        let request;
+        try {
+          request = new URL(requestUrl);
+        } catch {
+          throw new TypeError("MCP OAuth request URL is invalid.");
+        }
+        const redirectValues = request.searchParams.getAll("redirect_uri");
+        const stateValues = request.searchParams.getAll("state");
+        const scopeValues = request.searchParams.getAll("scope");
+        if (request.origin !== profile.origin || request.pathname !== "/oauth/authorize" || request.username !== "" || request.password !== "" || request.hash !== "" || requestUrl !== `${profile.origin}${request.pathname}${request.search}` || redirectValues.length !== 1 || stateValues.length > 1 || scopeValues.length !== 1) {
+          throw new TypeError("MCP OAuth request URL does not match the active profile authority.");
+        }
+        let registeredRedirect;
+        try {
+          registeredRedirect = new URL(redirectValues[0]);
+        } catch {
+          throw new TypeError("MCP OAuth redirect URI is invalid.");
+        }
+        if (registeredRedirect.username !== "" || registeredRedirect.password !== "" || registeredRedirect.hash !== "") {
+          throw new TypeError("MCP OAuth redirect URI is invalid.");
+        }
+        const authority = await this.verifiedAgentCliAuthority();
+        const response = asObject(await required4(this.api.authorizeMcp, "api.authorizeMcp").call(this.api, `${request.pathname}${request.search}`, authority.session.rawBearer), "MCP authorization");
+        if (response.authorized !== true || response.accountId !== authority.session.accountId || String(response.walletAddress).toLowerCase() !== authority.walletAddress || typeof response.clientName !== "string" || response.clientName.length < 1 || response.clientName.length > 128 || !Array.isArray(response.scopes) || response.scopes.some((scope) => typeof scope !== "string" || scope.length < 1) || typeof response.callbackUrl !== "string") {
+          throw new CliAuthorityError();
+        }
+        const requestedScopes = scopeValues[0].split(" ").filter(Boolean).sort();
+        const returnedScopes = [...response.scopes].sort();
+        if (requestedScopes.length < 1 || requestedScopes.length !== returnedScopes.length || requestedScopes.some((scope, index2) => scope !== returnedScopes[index2])) {
+          throw new CliAuthorityError();
+        }
+        let callback;
+        try {
+          callback = new URL(response.callbackUrl);
+        } catch {
+          throw new TypeError("MCP OAuth callback is invalid.");
+        }
+        const codes = callback.searchParams.getAll("code");
+        if (codes.length !== 1 || !/^[A-Za-z0-9_-]{43}$/u.test(codes[0])) {
+          throw new TypeError("MCP OAuth callback is invalid.");
+        }
+        const expectedCallback = new URL(registeredRedirect.href);
+        expectedCallback.searchParams.set("code", codes[0]);
+        if (stateValues.length === 1) expectedCallback.searchParams.set("state", stateValues[0]);
+        if (callback.href !== expectedCallback.href) {
+          throw new TypeError("MCP OAuth callback does not match the registered redirect and state.");
+        }
+        await required4(this.browserLauncher, "browser launcher").open(callback.href);
+        return Object.freeze({
+          authorized: true,
+          clientName: response.clientName,
+          walletAddress: authority.walletAddress,
+          environment: profile.environment,
+          scopes: Object.freeze([...returnedScopes])
+        });
+      }
       async createWallet() {
         const privateKey3 = generatePrivateKey();
         const walletAddress2 = privateKeyToAccount(privateKey3).address.toLowerCase();
@@ -39255,7 +39536,7 @@ var init_application = __esm({
           throw new TypeError("MCP doctor Session authority does not match the active wallet and profile.");
         }
         const mcp = await required4(this.api.inspectRemoteMcp, "api.inspectRemoteMcp").call(this.api);
-        if (mcp.url !== `${profile.origin}/mcp` || mcp.authorization !== "agent_cli_session_handoff" || JSON.stringify(mcp.supportedClients) !== JSON.stringify(["codex"])) {
+        if (mcp.url !== `${profile.origin}/mcp` || mcp.authorization !== "oauth" || JSON.stringify(mcp.supportedClients) !== JSON.stringify(["codex"])) {
           throw new TypeError("MCP doctor discovery does not match the authoritative profile.");
         }
         return Object.freeze({
@@ -39270,64 +39551,6 @@ var init_application = __esm({
           mcp
         });
       }
-      async launchMcpHarness(client) {
-        if (client !== "codex") throw new TypeError("Only the verified Codex MCP handoff is supported.");
-        const profile = await this.authorizedProfile();
-        const session = await this.networkSession(profile);
-        const wallet = await required4(this.state.readWalletAddress, "state.readWalletAddress").call(this.state);
-        const remoteSession = asObject(await required4(this.api.getSession, "api.getSession").call(this.api, session.rawBearer), "MCP handoff Session");
-        if (remoteSession.sessionId !== session.sessionId || remoteSession.accountId !== session.accountId || remoteSession.walletAddress !== session.walletAddress || wallet.walletAddress !== session.walletAddress || remoteSession.environment !== session.environment || remoteSession.audience !== "agent_cli" || typeof remoteSession.sessionExpiresAt !== "string" || Date.parse(remoteSession.sessionExpiresAt) <= Date.now()) {
-          throw new TypeError("MCP handoff Session authority does not match the active wallet and profile.");
-        }
-        const mcp = await required4(this.api.inspectRemoteMcp, "api.inspectRemoteMcp").call(this.api);
-        if (mcp.url !== `${profile.origin}/mcp` || mcp.authorization !== "agent_cli_session_handoff" || !mcp.supportedClients.includes(client)) {
-          throw new TypeError("MCP handoff manifest does not match the authoritative profile.");
-        }
-        const readGrant = required4(this.state.readMcpGrantForScopes, "state.readMcpGrantForScopes");
-        let grant = await readGrant.call(this.state, {
-          scopes: identityScopeValues,
-          accountId: session.accountId,
-          environment: session.environment
-        });
-        if (grant === null) {
-          const parentExpiry = Date.parse(remoteSession.sessionExpiresAt);
-          const expiry = Math.min(Date.now() + 12 * 60 * 60 * 1e3, parentExpiry - 1e3);
-          if (expiry <= Date.now() + 6e4) {
-            throw new TypeError("The AgentCLI Session expires too soon to launch Finch MCP. Log in again.");
-          }
-          await this.createMcpGrant(identityScopeValues, new Date(expiry).toISOString());
-          grant = await readGrant.call(this.state, {
-            scopes: identityScopeValues,
-            accountId: session.accountId,
-            environment: session.environment
-          });
-          if (grant === null) throw new TypeError("The new MCP handoff grant is unavailable in protected local state.");
-        }
-        parseCanonicalUuid(grant.grantId, "MCP handoff grantId");
-        if (!/^[A-Za-z0-9_-]{43}$/u.test(grant.rawBearer)) {
-          throw new TypeError("The selected MCP handoff grant is invalid.");
-        }
-        const remoteGrant = asObject(await required4(this.api.showGrant, "api.showGrant").call(this.api, grant.grantId, session.rawBearer), "MCP handoff grant");
-        if (remoteGrant.grantId !== grant.grantId || remoteGrant.audience !== "finch_mcp" || remoteGrant.environment !== session.environment || remoteGrant.status !== "active" || remoteGrant.revokedAt !== null || remoteGrant.expiresAt !== grant.expiresAt || remoteGrant.parentSessionExpiresAt !== remoteSession.sessionExpiresAt || JSON.stringify(remoteGrant.scopes) !== JSON.stringify(identityScopeValues) || Date.parse(grant.expiresAt) <= Date.now()) {
-          throw new TypeError("MCP handoff grant does not inherit the active parent Session authority.");
-        }
-        const launched = await required4(this.mcpHarness, "MCP Harness").launch({
-          client,
-          mcpUrl: mcp.url,
-          bearer: grant.rawBearer
-        });
-        return Object.freeze({
-          client,
-          launched: true,
-          browserAuthorization: false,
-          exitCode: launched.exitCode,
-          environment: session.environment,
-          accountId: session.accountId,
-          walletAddress: session.walletAddress,
-          grantId: grant.grantId,
-          grantExpiresAt: grant.expiresAt
-        });
-      }
       async assertNoBlockingRecoveries() {
         const recoveries = await this.state.listBlockingRecoveries?.call(this.state) ?? [];
         if (recoveries.length > 0) {
@@ -39736,7 +39959,10 @@ var init_application = __esm({
           environment: authority.session.environment
         });
         const published = await required4(this.skillLocalFlow, "skill local flow").publish(path, plan, context);
-        return { ...published, nextAction: { operationId: "skill_market.skills.get", request: { skillId: published.skillId } } };
+        return { ...published, nextAction: { operationId: "skill_market.skills.get", request: {
+          chainId: published.chainId,
+          skillId: published.skillId
+        } } };
       }
       async submitSkillVersion(path, planFile) {
         const plan = await readBoundedJsonFile(planFile);
@@ -39750,7 +39976,11 @@ var init_application = __esm({
           environment: authority.session.environment
         });
         const published = await required4(this.skillLocalFlow, "skill local flow").publishVersion(path, plan, context);
-        return { ...published, nextAction: { operationId: "skill_market.skills.get", request: { skillId: published.skillId, version: published.version } } };
+        return { ...published, nextAction: { operationId: "skill_market.skills.get", request: {
+          chainId: published.chainId,
+          skillId: published.skillId,
+          version: published.version
+        } } };
       }
       async submitSkillManage(kind, planFile) {
         const plan = await readBoundedJsonFile(planFile);
@@ -39758,7 +39988,10 @@ var init_application = __esm({
         assertSigningAuthority(plan, authority.session);
         const context = Object.freeze({ privateKey: authority.wallet.privateKey, walletAddress: authority.wallet.walletAddress, bearer: authority.session.rawBearer });
         const managed = await required4(this.skillLocalFlow, "skill local flow").manage(kind, plan, context);
-        return { ...managed, nextAction: { operationId: "skill_market.skills.get", request: { skillId: managed.skillId } } };
+        return { ...managed, nextAction: { operationId: "skill_market.skills.get", request: {
+          chainId: managed.chainId,
+          skillId: managed.skillId
+        } } };
       }
       async submitSkillPresentation(planFile) {
         const plan = await readBoundedJsonFile(planFile);
@@ -39766,7 +39999,10 @@ var init_application = __esm({
         assertSigningAuthority(plan, authority.session);
         const context = Object.freeze({ privateKey: authority.wallet.privateKey, walletAddress: authority.wallet.walletAddress, bearer: authority.session.rawBearer });
         const published = await required4(this.skillLocalFlow, "skill local flow").publishPresentation(plan, context);
-        return { ...published, nextAction: { operationId: "skill_market.manage.get", request: { skillId: published.skillId } } };
+        return { ...published, nextAction: { operationId: "skill_market.manage.get", request: {
+          chainId: published.chainId,
+          skillId: published.skillId
+        } } };
       }
       async uploadSkillAsset(path, planFile) {
         const plan = await readBoundedJsonFile(planFile);
@@ -39774,7 +40010,10 @@ var init_application = __esm({
         const uploaded = await required4(this.skillLocalFlow, "skill local flow").uploadCover(path, plan, context);
         return { ...uploaded, nextAction: {
           operationId: "skill_market.manage.get",
-          query: { skillId: uploaded.skillId }
+          request: {
+            chainId: uploaded.chainId,
+            skillId: uploaded.skillId
+          }
         } };
       }
       async recoverSkill(kind, fingerprint2) {
@@ -40109,7 +40348,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@finchtech/cli",
-      version: "0.1.0",
+      version: "0.2.1",
       description: "Finch Agent CLI for wallet-owned marketplace and MCP workflows.",
       type: "module",
       bin: {
@@ -40273,8 +40512,8 @@ async function routeCommand(arguments_, application) {
   if (first === "mcp" && second === "doctor" && arguments_.length === 2) {
     return result("mcp.doctor", await method(application.doctorMcp, "mcp doctor").call(application));
   }
-  if (first === "mcp" && second === "launch" && third === "codex" && arguments_.length === 3) {
-    return result("mcp.launch.codex", await method(application.launchMcpHarness, "mcp launch codex").call(application, "codex"));
+  if (first === "mcp" && second === "authorize" && arguments_.length === 3 && third !== void 0) {
+    return result("mcp.authorize", await method(application.authorizeMcp, "mcp authorize").call(application, third));
   }
   if (first === "mcp" && second === "grant" && third === "create") {
     const scopes = exactOption(arguments_, "--scopes").split(",");
@@ -40595,7 +40834,7 @@ var init_command_router = __esm({
       "site open",
       "site login",
       "mcp doctor",
-      "mcp launch codex",
+      "mcp authorize",
       "mcp grant create",
       "mcp grant show",
       "mcp grant revoke",
@@ -40661,7 +40900,7 @@ var init_command_router = __esm({
       "site open": "finch site open",
       "site login": "finch site login <REQUEST_URL>",
       "mcp doctor": "finch mcp doctor",
-      "mcp launch codex": "finch mcp launch codex",
+      "mcp authorize": "finch mcp authorize <REQUEST_URL>",
       "mcp grant create": "finch mcp grant create --scopes <CSV> --expires-at <ISO-8601>",
       "mcp grant show": "finch mcp grant show <GRANT_ID>",
       "mcp grant revoke": "finch mcp grant revoke <GRANT_ID>",
@@ -55389,6 +55628,38 @@ var init_chainConfig = __esm({
   }
 });
 
+// ../../node_modules/.pnpm/viem@2.55.15_bufferutil@4.1_ce20031be19c56210207d462110a7a29/node_modules/viem/_esm/chains/definitions/arbitrum.js
+var arbitrum;
+var init_arbitrum = __esm({
+  "../../node_modules/.pnpm/viem@2.55.15_bufferutil@4.1_ce20031be19c56210207d462110a7a29/node_modules/viem/_esm/chains/definitions/arbitrum.js"() {
+    init_defineChain();
+    arbitrum = /* @__PURE__ */ defineChain({
+      id: 42161,
+      name: "Arbitrum One",
+      nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+      blockTime: 250,
+      rpcUrls: {
+        default: {
+          http: ["https://arb1.arbitrum.io/rpc"]
+        }
+      },
+      blockExplorers: {
+        default: {
+          name: "Arbiscan",
+          url: "https://arbiscan.io",
+          apiUrl: "https://api.arbiscan.io/api"
+        }
+      },
+      contracts: {
+        multicall3: {
+          address: "0xca11bde05977b3631167028862be2a173976ca11",
+          blockCreated: 7654707
+        }
+      }
+    });
+  }
+});
+
 // ../../node_modules/.pnpm/viem@2.55.15_bufferutil@4.1_ce20031be19c56210207d462110a7a29/node_modules/viem/_esm/chains/definitions/base.js
 var sourceId, base, basePreconf;
 var init_base2 = __esm({
@@ -55525,11 +55796,141 @@ var init_baseSepolia = __esm({
   }
 });
 
+// ../../node_modules/.pnpm/viem@2.55.15_bufferutil@4.1_ce20031be19c56210207d462110a7a29/node_modules/viem/_esm/chains/definitions/bsc.js
+var bsc;
+var init_bsc = __esm({
+  "../../node_modules/.pnpm/viem@2.55.15_bufferutil@4.1_ce20031be19c56210207d462110a7a29/node_modules/viem/_esm/chains/definitions/bsc.js"() {
+    init_defineChain();
+    bsc = /* @__PURE__ */ defineChain({
+      id: 56,
+      name: "BNB Smart Chain",
+      blockTime: 750,
+      nativeCurrency: {
+        decimals: 18,
+        name: "BNB",
+        symbol: "BNB"
+      },
+      rpcUrls: {
+        default: { http: ["https://56.rpc.thirdweb.com"] }
+      },
+      blockExplorers: {
+        default: {
+          name: "BscScan",
+          url: "https://bscscan.com",
+          apiUrl: "https://api.bscscan.com/api"
+        }
+      },
+      contracts: {
+        multicall3: {
+          address: "0xca11bde05977b3631167028862be2a173976ca11",
+          blockCreated: 15921452
+        }
+      }
+    });
+  }
+});
+
+// ../../node_modules/.pnpm/viem@2.55.15_bufferutil@4.1_ce20031be19c56210207d462110a7a29/node_modules/viem/_esm/chains/definitions/mainnet.js
+var mainnet;
+var init_mainnet = __esm({
+  "../../node_modules/.pnpm/viem@2.55.15_bufferutil@4.1_ce20031be19c56210207d462110a7a29/node_modules/viem/_esm/chains/definitions/mainnet.js"() {
+    init_defineChain();
+    mainnet = /* @__PURE__ */ defineChain({
+      id: 1,
+      name: "Ethereum",
+      nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+      blockTime: 12e3,
+      rpcUrls: {
+        default: {
+          http: ["https://ethereum.reth.rs/rpc"]
+        }
+      },
+      blockExplorers: {
+        default: {
+          name: "Etherscan",
+          url: "https://etherscan.io",
+          apiUrl: "https://api.etherscan.io/api"
+        }
+      },
+      contracts: {
+        ensUniversalResolver: {
+          address: "0xeeeeeeee14d718c2b47d9923deab1335e144eeee",
+          blockCreated: 23085558
+        },
+        multicall3: {
+          address: "0xca11bde05977b3631167028862be2a173976ca11",
+          blockCreated: 14353601
+        }
+      }
+    });
+  }
+});
+
+// ../../node_modules/.pnpm/viem@2.55.15_bufferutil@4.1_ce20031be19c56210207d462110a7a29/node_modules/viem/_esm/chains/definitions/optimism.js
+var sourceId3, optimism;
+var init_optimism = __esm({
+  "../../node_modules/.pnpm/viem@2.55.15_bufferutil@4.1_ce20031be19c56210207d462110a7a29/node_modules/viem/_esm/chains/definitions/optimism.js"() {
+    init_chainConfig();
+    init_defineChain();
+    sourceId3 = 1;
+    optimism = /* @__PURE__ */ defineChain({
+      ...chainConfig,
+      id: 10,
+      name: "OP Mainnet",
+      nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+      rpcUrls: {
+        default: {
+          http: ["https://mainnet.optimism.io"]
+        }
+      },
+      blockExplorers: {
+        default: {
+          name: "Optimism Explorer",
+          url: "https://optimistic.etherscan.io",
+          apiUrl: "https://api-optimistic.etherscan.io/api"
+        }
+      },
+      contracts: {
+        ...chainConfig.contracts,
+        disputeGameFactory: {
+          [sourceId3]: {
+            address: "0xe5965Ab5962eDc7477C8520243A95517CD252fA9"
+          }
+        },
+        l2OutputOracle: {
+          [sourceId3]: {
+            address: "0xdfe97868233d1aa22e815a266982f2cf17685a27"
+          }
+        },
+        multicall3: {
+          address: "0xca11bde05977b3631167028862be2a173976ca11",
+          blockCreated: 4286263
+        },
+        portal: {
+          [sourceId3]: {
+            address: "0xbEb5Fc579115071764c7423A4f12eDde41f106Ed"
+          }
+        },
+        l1StandardBridge: {
+          [sourceId3]: {
+            address: "0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1"
+          }
+        }
+      },
+      sourceId: sourceId3
+    });
+  }
+});
+
 // ../../node_modules/.pnpm/viem@2.55.15_bufferutil@4.1_ce20031be19c56210207d462110a7a29/node_modules/viem/_esm/chains/index.js
 var init_chains2 = __esm({
   "../../node_modules/.pnpm/viem@2.55.15_bufferutil@4.1_ce20031be19c56210207d462110a7a29/node_modules/viem/_esm/chains/index.js"() {
+    init_arbitrum();
     init_base2();
     init_baseSepolia();
+    init_bsc();
+    init_mainnet();
+    init_optimism();
   }
 });
 
@@ -56135,40 +56536,10 @@ function textValue(value, name, allowEmpty = false) {
   return value;
 }
 function resolveSkillViemChain(chainId) {
-  if (chainId === base.id) return base;
-  if (chainId === baseSepolia.id) return baseSepolia;
+  const chain = [mainnet, optimism, bsc, base, arbitrum, baseSepolia].find((candidate) => candidate.id === chainId);
+  if (chain !== void 0) return chain;
   throw new TypeError(`Unsupported Skill chain ${String(chainId)}.`);
 }
-function viemFactory2(rpcUrl) {
-  const transport = http2(parseRpcUrl3(rpcUrl), { retryCount: 0, timeout: 2e4 });
-  return (key, chainId) => {
-    const chain = resolveSkillViemChain(chainId);
-    const account = privateKeyToAccount(key);
-    const publicClient = createPublicClient({ chain, transport });
-    const walletClient = createWalletClient({ account, chain, transport });
-    return Object.freeze({
-      walletAddress: account.address.toLowerCase(),
-      getChainId: () => publicClient.getChainId(),
-      sendTransaction: (input) => walletClient.sendTransaction({ account, chain, ...input }),
-      waitForReceipt: async (hash5) => {
-        const receipt = await publicClient.waitForTransactionReceipt({ hash: hash5, confirmations: 1, timeout: 12e4 });
-        return Object.freeze({ status: receipt.status, blockNumber: receipt.blockNumber });
-      },
-      getTransactionCall: async (hash5) => {
-        const transaction2 = await publicClient.getTransaction({ hash: hash5 });
-        return Object.freeze({ from: transaction2.from, to: transaction2.to, data: transaction2.input, value: transaction2.value });
-      },
-      getTransactionRecord: async (hash5) => {
-        const [transaction2, receipt] = await Promise.all([
-          publicClient.getTransaction({ hash: hash5 }),
-          publicClient.getTransactionReceipt({ hash: hash5 })
-        ]);
-        if (transaction2.blockNumber === null || transaction2.blockNumber !== receipt.blockNumber) throw new TypeError("Skill recovery transaction is not settled in its recorded block.");
-        return Object.freeze({ from: transaction2.from, to: transaction2.to, data: transaction2.input, value: transaction2.value, status: receipt.status, blockNumber: receipt.blockNumber });
-      }
-    });
-  };
-}
 function expectedCall(kind, request, deployment2) {
   const skillId = () => unsigned2(request.skillId, "Skill id", true);
   if (kind === "purchase") {
@@ -56228,7 +56599,7 @@ function assertIntentMatches(raw, expected, chainId) {
     throw new TypeError("Skill intent calldata, target, or value does not match its reviewed request.");
   }
 }
-var import_ajv3, instanceAbi, tokenAbi, revenueAbi, factoryAbi, validateIntent2, InstalledSkillIntentSender;
+var import_ajv3, instanceAbi, tokenAbi, revenueAbi, factoryAbi, validateIntent2, viemFactory2, InstalledSkillIntentSender;
 var init_skill_intent_sender = __esm({
   "src/skill-intent-sender.ts"() {
     "use strict";
@@ -56256,34 +56627,80 @@ var init_skill_intent_sender = __esm({
       "function createSkill((bytes32 mdHash, bytes32 packageHash, string packageURI, string slug, string name, string category, string licenseTypeName, string imageURI, bool plaintext, uint256 unitPrice, uint256 maxSupply, uint96 royaltyBPS, uint256 usageLimit) params)"
     ]);
     validateIntent2 = new import_ajv3.default({ allErrors: true, strict: false }).compile(skillIntentResponseSchema);
+    viemFactory2 = (key, chainId, rpcUrl) => {
+      const transport = http2(parseRpcUrl3(rpcUrl), { retryCount: 0, timeout: 2e4 });
+      const chain = resolveSkillViemChain(chainId);
+      const account = privateKeyToAccount(key);
+      const publicClient = createPublicClient({ chain, transport });
+      const walletClient = createWalletClient({ account, chain, transport });
+      return Object.freeze({
+        walletAddress: account.address.toLowerCase(),
+        getChainId: () => publicClient.getChainId(),
+        sendTransaction: (input) => walletClient.sendTransaction({ account, chain, ...input }),
+        waitForReceipt: async (hash5) => {
+          const receipt = await publicClient.waitForTransactionReceipt({ hash: hash5, confirmations: 1, timeout: 12e4 });
+          return Object.freeze({ status: receipt.status, blockNumber: receipt.blockNumber });
+        },
+        getTransactionCall: async (hash5) => {
+          const transaction2 = await publicClient.getTransaction({ hash: hash5 });
+          return Object.freeze({ from: transaction2.from, to: transaction2.to, data: transaction2.input, value: transaction2.value });
+        },
+        getTransactionRecord: async (hash5) => {
+          const [transaction2, receipt] = await Promise.all([
+            publicClient.getTransaction({ hash: hash5 }),
+            publicClient.getTransactionReceipt({ hash: hash5 })
+          ]);
+          if (transaction2.blockNumber === null || transaction2.blockNumber !== receipt.blockNumber) throw new TypeError("Skill recovery transaction is not settled in its recorded block.");
+          return Object.freeze({ from: transaction2.from, to: transaction2.to, data: transaction2.input, value: transaction2.value, status: receipt.status, blockNumber: receipt.blockNumber });
+        }
+      });
+    };
     InstalledSkillIntentSender = class {
+      constructor(environment3 = resolveSkillProtocolEnvironment(process.env.FINCH_ENVIRONMENT), environmentVariables = process.env, rpcFactory = viemFactory2) {
+        this.environment = environment3;
+        this.environmentVariables = environmentVariables;
+        this.rpcFactory = rpcFactory;
+      }
+      environment;
+      environmentVariables;
       rpcFactory;
-      deployment;
-      constructor(rpcUrl, factory, environment3 = resolveSkillProtocolEnvironment(process.env.FINCH_ENVIRONMENT)) {
-        parseRpcUrl3(rpcUrl);
-        this.rpcFactory = factory ?? viemFactory2(rpcUrl);
-        this.deployment = getSkillProtocolDeployment(resolveSkillProtocolEnvironment(environment3));
+      authority(chainIdValue) {
+        if (!Number.isInteger(chainIdValue) || Number(chainIdValue) < 1) {
+          throw new TypeError("Skill request chain is invalid.");
+        }
+        return getSkillProtocolDeployment(resolveSkillProtocolEnvironment(this.environment), Number(chainIdValue));
+      }
+      async rpc(privateKey3, walletAddress2, deployment2) {
+        const override = this.environmentVariables[`FINCHTECH_RPC_URL_${deployment2.chainId}`];
+        const rpcUrl = parseRpcUrl3(override ?? deployment2.defaultRpcUrls[0]);
+        const rpc = this.rpcFactory(installedPrivateKey2(privateKey3), deployment2.chainId, rpcUrl);
+        if (rpc.walletAddress.toLowerCase() !== walletAddress2.toLowerCase() || await rpc.getChainId() !== deployment2.chainId) {
+          throw new TypeError("The wallet or RPC chain does not match the selected Skill authority.");
+        }
+        return rpc;
       }
       buyerCall(input) {
         if (!validateIntent2(input.intent)) throw new TypeError("Skill intent does not match the frozen contract.");
-        if (input.intent.kind !== input.expectedKind || input.intent.sourceCommit !== this.deployment.sourceCommit || input.intent.chainId !== this.deployment.chainId) throw new TypeError("Skill intent authority is invalid.");
+        const deployment2 = this.authority(input.intent.chainId);
+        if (input.intent.kind !== input.expectedKind || input.intent.sourceCommit !== deployment2.sourceCommit) {
+          throw new TypeError("Skill intent authority is invalid.");
+        }
         if (typeof input.intent.walletAddress !== "string" || input.intent.walletAddress.toLowerCase() !== input.walletAddress.toLowerCase()) {
           throw new TypeError("Skill intent wallet does not match the active CLI wallet.");
         }
-        const expected = expectedCall(input.expectedKind, record4(input.intent.request, "Skill intent request"), this.deployment);
-        assertIntentMatches(input.intent, expected, this.deployment.chainId);
-        return expected;
-      }
-      async buyerRpc(privateKey3, walletAddress2) {
-        const rpc = this.rpcFactory(installedPrivateKey2(privateKey3), this.deployment.chainId);
-        if (rpc.walletAddress !== walletAddress2 || await rpc.getChainId() !== this.deployment.chainId) {
-          throw new TypeError("The wallet or RPC chain does not match the selected Skill authority.");
-        }
-        return rpc;
+        const request = record4(input.intent.request, "Skill intent request");
+        if (request.chainId !== deployment2.chainId) throw new TypeError("Skill intent request chain is invalid.");
+        const expected = expectedCall(input.expectedKind, request, deployment2);
+        assertIntentMatches(
+          input.intent,
+          expected,
+          deployment2.chainId
+        );
+        return Object.freeze({ expected, deployment: deployment2 });
       }
       async submit(input) {
-        const expected = this.buyerCall(input);
-        const rpc = await this.buyerRpc(input.privateKey, input.walletAddress);
+        const { expected, deployment: deployment2 } = this.buyerCall(input);
+        const rpc = await this.rpc(input.privateKey, input.walletAddress, deployment2);
         const transactionHash3 = await rpc.sendTransaction(expected);
         await input.onBroadcast?.({ fingerprint: skillBuyerIntentFingerprint(input.intent), transactionHash: transactionHash3 });
         const receipt = await rpc.waitForReceipt(transactionHash3);
@@ -56291,8 +56708,8 @@ var init_skill_intent_sender = __esm({
         return Object.freeze({ transactionHash: transactionHash3, blockNumber: receipt.blockNumber.toString() });
       }
       async verifyBuyerIntent(input) {
-        const expected = this.buyerCall(input);
-        const rpc = await this.buyerRpc(input.privateKey, input.walletAddress);
+        const { expected, deployment: deployment2 } = this.buyerCall(input);
+        const rpc = await this.rpc(input.privateKey, input.walletAddress, deployment2);
         const transactionHash3 = hash4(input.transactionHash, "Skill buyer recovery transaction hash");
         const exactTransaction2 = (actual2) => actual2.from.toLowerCase() === input.walletAddress.toLowerCase() && actual2.to?.toLowerCase() === expected.to.toLowerCase() && actual2.data === expected.data && actual2.value === expected.value;
         if (input.blockNumber === null) {
@@ -56311,10 +56728,12 @@ var init_skill_intent_sender = __esm({
         return Object.freeze({ transactionHash: transactionHash3, blockNumber: actual.blockNumber.toString() });
       }
       async submitPrepared(input) {
-        const rpc = this.rpcFactory(installedPrivateKey2(input.privateKey), this.deployment.chainId);
-        if (rpc.walletAddress !== input.walletAddress || await rpc.getChainId() !== this.deployment.chainId) throw new TypeError("The wallet or RPC chain does not match the selected Skill authority.");
-        const expected = expectedPreparedCall(input.action, record4(input.request, "Skill prepared request"), this.deployment);
-        assertIntentMatches(input.intent, expected, this.deployment.chainId);
+        const request = record4(input.request, "Skill prepared request");
+        const deployment2 = this.authority(request.chainId);
+        if (input.intent.chainId !== deployment2.chainId) throw new TypeError("Skill prepared intent chain is invalid.");
+        const expected = expectedPreparedCall(input.action, request, deployment2);
+        assertIntentMatches(input.intent, expected, deployment2.chainId);
+        const rpc = await this.rpc(input.privateKey, input.walletAddress, deployment2);
         const transactionHash3 = await rpc.sendTransaction(expected);
         await input.onBroadcast?.({ transactionHash: transactionHash3 });
         const receipt = await rpc.waitForReceipt(transactionHash3);
@@ -56322,9 +56741,10 @@ var init_skill_intent_sender = __esm({
         return Object.freeze({ transactionHash: transactionHash3, blockNumber: receipt.blockNumber.toString() });
       }
       async verifyPrepared(input) {
-        const rpc = this.rpcFactory(installedPrivateKey2(input.privateKey), this.deployment.chainId);
-        if (rpc.walletAddress !== input.walletAddress || await rpc.getChainId() !== this.deployment.chainId) throw new TypeError("The wallet or RPC chain does not match the selected Skill authority.");
-        const expected = expectedPreparedCall(input.action, record4(input.request, "Skill prepared request"), this.deployment);
+        const request = record4(input.request, "Skill prepared request");
+        const deployment2 = this.authority(request.chainId);
+        const expected = expectedPreparedCall(input.action, request, deployment2);
+        const rpc = await this.rpc(input.privateKey, input.walletAddress, deployment2);
         const transactionHash3 = hash4(input.transactionHash, "Skill recovery transaction hash");
         const exactTransaction2 = (actual2) => actual2.from.toLowerCase() === input.walletAddress && actual2.to?.toLowerCase() === expected.to.toLowerCase() && actual2.data === expected.data && actual2.value === expected.value;
         if (input.blockNumber === null) {
@@ -56346,81 +56766,14 @@ var init_skill_intent_sender = __esm({
   }
 });
 
-// src/mcp-handoff.ts
-import { spawn } from "node:child_process";
-function canonicalMcpUrl(value) {
-  const url2 = new URL(value);
-  const localHttp = url2.protocol === "http:" && ["127.0.0.1", "localhost", "[::1]"].includes(url2.hostname);
-  if (url2.protocol !== "https:" && !localHttp || url2.username !== "" || url2.password !== "" || url2.pathname !== "/mcp" || url2.search !== "" || url2.hash !== "") {
-    throw new TypeError("Finch MCP handoff URL is invalid.");
-  }
-  return url2.toString();
-}
-var MCP_HANDOFF_TOKEN_ENV, runInteractiveProcess, InstalledCodexMcpHarness;
-var init_mcp_handoff = __esm({
-  "src/mcp-handoff.ts"() {
-    "use strict";
-    MCP_HANDOFF_TOKEN_ENV = "FINCHTECH_MCP_HANDOFF_TOKEN";
-    runInteractiveProcess = async (input) => new Promise((resolve4, reject5) => {
-      const child = spawn(input.executable, [...input.arguments], {
-        env: input.environment,
-        shell: false,
-        stdio: "inherit"
-      });
-      child.once("error", reject5);
-      child.once("exit", (code, signal) => {
-        if (signal !== null || code === null) {
-          reject5(new TypeError("Codex MCP handoff terminated without an exit code."));
-          return;
-        }
-        resolve4(Object.freeze({ exitCode: code }));
-      });
-    });
-    InstalledCodexMcpHarness = class {
-      baseEnvironment;
-      run;
-      platform;
-      constructor(baseEnvironment = process.env, run = runInteractiveProcess, platform = process.platform) {
-        this.baseEnvironment = { ...baseEnvironment };
-        this.run = run;
-        this.platform = platform;
-      }
-      async launch(input) {
-        if (input.client !== "codex" || !/^[A-Za-z0-9_-]{43}$/u.test(input.bearer)) {
-          throw new TypeError("Codex MCP handoff authority is invalid.");
-        }
-        const mcpUrl = canonicalMcpUrl(input.mcpUrl);
-        const codexArguments = Object.freeze([
-          "-c",
-          `mcp_servers.finch.url="${mcpUrl}"`,
-          "-c",
-          `mcp_servers.finch.bearer_token_env_var="${MCP_HANDOFF_TOKEN_ENV}"`,
-          "-c",
-          "mcp_servers.finch.enabled=true"
-        ]);
-        const windows = this.platform === "win32";
-        const result2 = await this.run(Object.freeze({
-          executable: windows ? this.baseEnvironment.ComSpec ?? "cmd.exe" : "codex",
-          arguments: windows ? Object.freeze(["/d", "/s", "/c", "codex", ...codexArguments]) : codexArguments,
-          environment: Object.freeze({ ...this.baseEnvironment, [MCP_HANDOFF_TOKEN_ENV]: input.bearer })
-        }));
-        if (!Number.isInteger(result2.exitCode) || result2.exitCode !== 0) {
-          throw new TypeError(`Codex exited with status ${String(result2.exitCode)}.`);
-        }
-        return Object.freeze({ exitCode: result2.exitCode });
-      }
-    };
-  }
-});
-
 // src/browser-launcher.ts
-import { spawn as spawn2 } from "node:child_process";
+import { spawn } from "node:child_process";
 var launchBrowserCommand, InstalledBrowserLauncher;
 var init_browser_launcher = __esm({
   "src/browser-launcher.ts"() {
     "use strict";
     init_cli_error();
-    launchBrowserCommand = (command, arguments_) => spawn2(
+    launchBrowserCommand = (command, arguments_) => spawn(
       command,
       [...arguments_],
       { stdio: "ignore", windowsHide: true }
@@ -56432,8 +56785,8 @@ var init_browser_launcher = __esm({
       launch;
       async open(url2) {
         await new Promise((resolve4, reject5) => {
-          const command = process.platform === "win32" ? "cmd" : process.platform === "darwin" ? "open" : "xdg-open";
-          const args = process.platform === "win32" ? ["/d", "/s", "/c", "start", "", url2] : [url2];
+          const command = process.platform === "win32" ? "rundll32.exe" : process.platform === "darwin" ? "open" : "xdg-open";
+          const args = process.platform === "win32" ? ["url.dll,FileProtocolHandler", url2] : [url2];
           const child = this.launch(command, args);
           child.once("error", () => reject5(new BrowserOpenError()));
           child.once("close", (code) => code === 0 ? resolve4() : reject5(new BrowserOpenError()));
@@ -56525,15 +56878,6 @@ function resolveInstalledRpcUrls(profile, explicitRpcUrl, command) {
       task: explicitRpcUrl ?? deployment2.defaultRpcUrls[0]
     });
   }
-  if (command === "skill") {
-    if (profile.environment === "local") {
-      return explicitRpcUrl === void 0 ? Object.freeze({}) : Object.freeze({ skill: explicitRpcUrl });
-    }
-    const deployment2 = getSkillProtocolDeployment(profile.environment);
-    return Object.freeze({
-      skill: explicitRpcUrl ?? deployment2.defaultRpcUrls[0]
-    });
-  }
   return Object.freeze({});
 }
 async function runInstalledCli(arguments_, environment3 = process.env, authorities = {}) {
@@ -56547,7 +56891,7 @@ async function runInstalledCli(arguments_, environment3 = process.env, authoriti
   const signer = new InstalledWalletSigner();
   const explicitRpcUrl = profile?.chainId === 8453 ? environment3.FINCHTECH_RPC_URL_8453 : environment3.FINCHTECH_RPC_URL_84532;
   const rpcUrls = resolveInstalledRpcUrls(profile, explicitRpcUrl, arguments_[0]);
-  const skillIntentSender = rpcUrls.skill === void 0 ? void 0 : new InstalledSkillIntentSender(rpcUrls.skill, void 0, profile?.environment);
+  const skillIntentSender = profile === void 0 || arguments_[0] !== "skill" ? void 0 : new InstalledSkillIntentSender(profile.environment, environment3);
   const application = new FinchCliApplication({
     api,
     state,
@@ -56560,7 +56904,6 @@ async function runInstalledCli(arguments_, environment3 = process.env, authoriti
     taskProtocolSender: rpcUrls.task === void 0 ? void 0 : new InstalledTaskProtocolSender(rpcUrls.task),
     skillIntentSender,
     skillLocalFlow: profile === void 0 || skillIntentSender === void 0 ? void 0 : new SkillLocalFlow(api, skillIntentSender, signer, void 0, void 0, state),
-    mcpHarness: authorities.mcpHarness ?? new InstalledCodexMcpHarness(environment3),
     browserLauncher: new InstalledBrowserLauncher()
   });
   return routeCommand(arguments_, application);
@@ -56580,7 +56923,6 @@ var init_main = __esm({
     init_task_protocol_sender();
     init_skill_intent_sender();
     init_skill_local_flow();
-    init_mcp_handoff();
     init_browser_launcher();
   }
 });