cloudflare-mcp-smart-proxy 1.5.0 → 1.5.2

package/README.md

@@ -44,16 +44,30 @@ npx -y -p cloudflare-mcp-smart-proxy cloudmcp-connector activate codex \
   --cloud-url https://your-cloudmcp.example.com
 ```
 
-第一次运行会生成设备密钥并发起接入申请，不会取得任何租户配置或凭证。管理员在 CloudMCP 后台的“生态连接中心”选择精确生态与工作区并批准后，将一次性审批密令回传给智能体。智能体随后运行：
+第一次运行会生成设备密钥并发起接入申请，不会取得任何租户配置或凭证。管理员在 CloudMCP 后台“生态连接中心”的专用审批表单中核对申请者，勾选一个或多个环境空间和原子能力并批准后，将一次性审批密令回传给智能体。智能体随后运行：
 
 ```bash
-CLOUDMCP_APPROVAL_CODE='<一次性审批密令>' \
+printf '请输入一次性审批密令：'
+read -s CLOUDMCP_APPROVAL_CODE
+printf '\n'
+export CLOUDMCP_APPROVAL_CODE
 npx -y -p cloudflare-mcp-smart-proxy cloudmcp-connector activate codex \
   --cloud-url https://your-cloudmcp.example.com
+unset CLOUDMCP_APPROVAL_CODE
 ```
 
 审批密令 10 分钟内有效、只能成功领取一次，并且只能由原申请设备签名领取。连接凭证写入权限为 `0600` 的独立文件，IDE 配置只保存该文件路径。CloudMCP 的机器可发现入口为 `/.well-known/cloudmcp`。
 
+如果本机申请已被拒绝或过期，直接再次运行无审批密令的 `activate` 命令会复用原设备身份并自动创建新申请。也可显式要求重新申请：
+
+```bash
+npx -y -p cloudflare-mcp-smart-proxy cloudmcp-connector activate codex \
+  --cloud-url https://your-cloudmcp.example.com \
+  --reapply
+```
+
+该操作不会删除或重建设备身份，也不会在新申请创建成功前改写现有凭证。若设备连接仍处于有效状态，后台会拒绝重复申请；管理员应先撤销该连接，再运行上述命令。
+
 ## 目标配置文件
 
 ### Codex

package/connector-cli.js

@@ -40,6 +40,7 @@ function printUsage() {
   console.error('  --dry-run                  Show output without writing');
   console.error('  --show-secrets             Explicitly include credentials in print output');
   console.error('  --approval-code <code>     One-time code shown by the CloudMCP administrator');
+  console.error('  --reapply                  Reuse this device identity and create a new approval request');
   console.error('');
   console.error('The reload codex command uses the existing Codex config and requires no credentials.');
 }
@@ -58,7 +59,7 @@ function parseArgs(argv) {
     }
 
     const key = token.slice(2);
-    if (key === 'dry-run' || key === 'show-secrets') {
+    if (key === 'dry-run' || key === 'show-secrets' || key === 'reapply') {
       options[key === 'dry-run' ? 'dryRun' : key] = true;
       continue;
     }
@@ -144,6 +145,10 @@ async function runActivation(options) {
   const identity = new DeviceIdentity({ identityPath: paths.deviceIdentityPath });
   const device = await identity.loadOrCreate();
   const approvalCode = options['approval-code'] || process.env.CLOUDMCP_APPROVAL_CODE || '';
+  const reapply = options.reapply === true;
+  if (approvalCode && reapply) {
+    throw new Error('--reapply cannot be combined with --approval-code');
+  }
   let pending = null;
   try {
     pending = JSON.parse(fs.readFileSync(paths.pendingPath, 'utf8'));
@@ -192,14 +197,7 @@ async function runActivation(options) {
     console.error(`credential: ${paths.credentialPath}`);
   };
 
-  if (fs.existsSync(paths.credentialPath)) {
-    const connection = JSON.parse(fs.readFileSync(paths.credentialPath, 'utf8'));
-    await installClaimedConnection(connection);
-    return;
-  }
-
-  if (!pending) {
-    if (approvalCode) throw new Error('No local activation request matches this CloudMCP URL and workspace');
+  const createApprovalRequest = async ({ replacesRequestId = '' } = {}) => {
     const requested = await activationFetch(`${paths.cloudUrl}/connectors/activation-requests`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
@@ -221,9 +219,21 @@ async function runActivation(options) {
       createdAt: Date.now()
     };
     writeFileAtomically(paths.pendingPath, `${JSON.stringify(pending, null, 2)}\n`);
+    if (replacesRequestId) console.error(`replaced approval request: ${replacesRequestId}`);
     console.error(`approval request: ${pending.requestId}`);
     console.error('status: pending administrator approval');
     console.error('After approval, rerun this command with --approval-code <code>.');
+  };
+
+  if (fs.existsSync(paths.credentialPath) && !reapply) {
+    const connection = JSON.parse(fs.readFileSync(paths.credentialPath, 'utf8'));
+    await installClaimedConnection(connection);
+    return;
+  }
+
+  if (!pending || reapply) {
+    if (approvalCode) throw new Error('No local activation request matches this CloudMCP URL and workspace');
+    await createApprovalRequest({ replacesRequestId: reapply ? pending?.requestId : '' });
     return;
   }
 
@@ -232,8 +242,14 @@ async function runActivation(options) {
       `${paths.cloudUrl}/connectors/activation-requests/${encodeURIComponent(pending.requestId)}`,
       { headers: { Authorization: `Activation ${pending.requestToken}` } }
     );
+    const currentStatus = status.activationRequest.status;
+    if (currentStatus === 'rejected' || currentStatus === 'expired') {
+      console.error(`approval request ${pending.requestId} is ${currentStatus}; creating a new request with the same device identity.`);
+      await createApprovalRequest({ replacesRequestId: pending.requestId });
+      return;
+    }
     console.error(`approval request: ${pending.requestId}`);
-    console.error(`status: ${status.activationRequest.status}`);
+    console.error(`status: ${currentStatus}`);
     console.error('When approved, rerun with --approval-code <code>.');
     return;
   }
@@ -364,4 +380,8 @@ async function main() {
   }
 }
 
-main();
+if (process.argv[1] && path.resolve(process.argv[1]) === __filename) {
+  main();
+}
+
+export { parseArgs };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudflare-mcp-smart-proxy",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "Smart proxy for Cloudflare MCP - routes tools to cloud or local execution",
   "repository": {
     "type": "git",