chore: move mcp cloudrun fix to PR #945, keep #933 dsh-plugin only

Author: t

mcp/src/tools/cloudrun-process-log.test.ts

@@ -169,133 +169,3 @@ describe("queryCloudRun getProcessLog handler", () => {
     expect(manager.cloudrun.getProcessLog).not.toHaveBeenCalled();
   });
 });
-
-const CODING_BUILD_LOG_ERROR =
-  "[DescribeCloudRunBuildLog] User not created or may not qcloud user, please login CODING and try again.";
-
-describe("buildGetDeployLogCodingFallback next_step action union", () => {
-  it("with runId: next_step and nextActions only use getProcessLog (never getDeployLog)", async () => {
-    const { buildGetDeployLogCodingFallback } = await import("./cloudrun.js");
-    const result = buildGetDeployLogCodingFallback({
-      serverName: "svc-a",
-      runId: "run-1",
-      reason: "coding",
-    });
-
-    expect(result.data.next_step.action).toBe("getProcessLog");
-    expect(result.data.next_step.suggested_args.action).toBe("getProcessLog");
-    expect(result.nextActions.map((a) => a.action)).toEqual(["getProcessLog"]);
-    expect(result.nextActions[0]).toMatchObject({
-      tool: "queryCloudRun",
-      action: "getProcessLog",
-      args: {
-        action: "getProcessLog",
-        detailServerName: "svc-a",
-        runId: "run-1",
-      },
-    });
-  });
-
-  it("without runId: next_step is getDeployRecords and nextActions stay on follow-up union", async () => {
-    const { buildGetDeployLogCodingFallback } = await import("./cloudrun.js");
-    const result = buildGetDeployLogCodingFallback({
-      serverName: "svc-b",
-      reason: "image_no_build",
-    });
-
-    expect(result.data.next_step.action).toBe("getDeployRecords");
-    expect(result.data.next_step.suggested_args.action).toBe("getDeployRecords");
-    expect(result.nextActions.map((a) => a.action)).toEqual([
-      "getDeployRecords",
-      "getProcessLog",
-    ]);
-    for (const next of result.nextActions) {
-      expect(next.args.action).toBe(next.action);
-    }
-  });
-});
-
-describe("queryCloudRun getDeployLog CODING fallback", () => {
-  it("rewrites CODING getBuildLog failures to getProcessLog nextActions", async () => {
-    const manager = makeManager({
-      getBuildLog: vi.fn().mockRejectedValue(new Error(CODING_BUILD_LOG_ERROR)),
-    });
-    mockGetCloudBaseManager.mockReturnValue(manager);
-    const { tools } = await createCloudRunTools();
-
-    const res = await tools.queryCloudRun.handler({
-      action: "getDeployLog",
-      detailServerName: "my-svc",
-    });
-    const parsed = parseToolResult(res);
-    const payloadText = JSON.stringify(parsed);
-
-    expect(parsed.success).toBe(false);
-    expect(parsed.error).toBe("CODING_BUILD_LOG_UNAVAILABLE");
-    expect(parsed.message).toMatch(/getProcessLog/);
-    expect(parsed.message).toMatch(/my-svc/);
-    expect(parsed.message).toMatch(/run-latest/);
-    expect(parsed.nextActions).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          tool: "queryCloudRun",
-          action: "getProcessLog",
-          args: expect.objectContaining({
-            action: "getProcessLog",
-            detailServerName: "my-svc",
-            runId: "run-latest",
-          }),
-        }),
-      ]),
-    );
-    expect(parsed.data.next_step.action).toBe("getProcessLog");
-    expect(payloadText).toMatch(/getProcessLog/);
-    expect(payloadText).not.toBe(JSON.stringify({ success: false, error: CODING_BUILD_LOG_ERROR }));
-    expect(manager.cloudrun.getBuildLog).toHaveBeenCalled();
-    expect(manager.cloudrun.getProcessLog).not.toHaveBeenCalled();
-  });
-
-  it("skips getBuildLog when latest BuildId is 0 (image deploy)", async () => {
-    const manager = makeManager({
-      getDeployRecords: vi.fn().mockResolvedValue({
-        DeployRecords: [
-          {
-            DeployId: "d-image",
-            Status: "normal",
-            RunId: "run-image",
-            BuildId: 0,
-          },
-        ],
-      }),
-    });
-    mockGetCloudBaseManager.mockReturnValue(manager);
-    const { tools } = await createCloudRunTools();
-
-    const res = await tools.queryCloudRun.handler({
-      action: "getDeployLog",
-      detailServerName: "image-svc",
-    });
-    const parsed = parseToolResult(res);
-
-    expect(parsed.success).toBe(false);
-    expect(parsed.error).toBe("NO_CODING_BUILD_FOR_IMAGE_DEPLOY");
-    expect(parsed.nextActions[0].action).toBe("getProcessLog");
-    expect(parsed.nextActions[0].args.runId).toBe("run-image");
-    expect(manager.cloudrun.getBuildLog).not.toHaveBeenCalled();
-  });
-
-  it("does not rewrite unrelated getBuildLog errors", async () => {
-    const manager = makeManager({
-      getBuildLog: vi.fn().mockRejectedValue(new Error("network timeout")),
-    });
-    mockGetCloudBaseManager.mockReturnValue(manager);
-    const { tools } = await createCloudRunTools();
-
-    await expect(
-      tools.queryCloudRun.handler({
-        action: "getDeployLog",
-        detailServerName: "my-svc",
-      }),
-    ).rejects.toThrow("network timeout");
-  });
-});

mcp/src/tools/cloudrun.ts

@@ -302,27 +302,9 @@ export type CloudRunDeployRegistration = {
   waitMs: number;
 };
 
-export type CloudRunDeployNextStepAction =
-  | "getDeployLog"
-  | "getProcessLog"
-  | "getDeployRecords";
-
-/**
- * Follow-up next_step after getDeployLog is unavailable (CODING login / image
- * deploy). Must never suggest getDeployLog again.
- */
-export type CloudRunDeployFollowUpAction = "getProcessLog" | "getDeployRecords";
-
 export type CloudRunDeployNextStep = {
   tool: "queryCloudRun";
-  action: CloudRunDeployNextStepAction;
-  suggested_args: Record<string, string | number>;
-  note?: string;
-};
-
-export type CloudRunDeployFollowUpNextStep = {
-  tool: "queryCloudRun";
-  action: CloudRunDeployFollowUpAction;
+  action: "getDeployLog" | "getProcessLog" | "getDeployRecords";
   suggested_args: Record<string, string | number>;
   note?: string;
 };
@@ -339,110 +321,6 @@ export function isValidCloudRunRunId(value: unknown): value is string {
   return typeof value === "string" && value.trim().length > 0;
 }
 
-/**
- * DescribeCloudRunBuildLog / getBuildLog fails when the Tencent Cloud account
- * has no CODING user. Agents should switch to getProcessLog (RunId) instead of
- * retrying getDeployLog.
- */
-export function isCloudRunCodingBuildLogError(error: unknown): boolean {
-  const message = error instanceof Error ? error.message : String(error);
-  return /DescribeCloudRunBuildLog|please login CODING|login CODING|User not created or may not qcloud user/i.test(
-    message,
-  );
-}
-
-export type CloudRunGetProcessLogNextAction = {
-  tool: "queryCloudRun";
-  action: CloudRunDeployFollowUpAction;
-  args: {
-    action: CloudRunDeployFollowUpAction;
-    detailServerName: string;
-    runId?: string;
-  };
-};
-
-export function buildGetDeployLogCodingFallback(options: {
-  serverName: string;
-  runId?: string;
-  upstreamError?: string;
-  reason: "coding" | "image_no_build";
-}): {
-  success: false;
-  error: string;
-  message: string;
-  nextActions: CloudRunGetProcessLogNextAction[];
-  data: {
-    runId?: string;
-    next_step: CloudRunDeployFollowUpNextStep;
-    upstreamError?: string;
-  };
-} {
-  const runId = isValidCloudRunRunId(options.runId) ? options.runId.trim() : undefined;
-  // Narrow to follow-up actions only — never suggest getDeployLog again.
-  const next_step: CloudRunDeployFollowUpNextStep = runId
-    ? {
-        tool: "queryCloudRun",
-        action: "getProcessLog",
-        suggested_args: {
-          action: "getProcessLog",
-          detailServerName: options.serverName,
-          runId,
-        },
-        note: "getDeployLog needs CODING / DescribeCloudRunBuildLog. Use getProcessLog for deploy-step and runtime logs.",
-      }
-    : {
-        tool: "queryCloudRun",
-        action: "getDeployRecords",
-        suggested_args: {
-          action: "getDeployRecords",
-          detailServerName: options.serverName,
-        },
-        note: "Read latestDeploy.RunId from getDeployRecords, then queryCloudRun(action=\"getProcessLog\"). Skip retrying getDeployLog for CODING login errors.",
-      };
-
-  const nextActions: CloudRunGetProcessLogNextAction[] = [
-    {
-      tool: "queryCloudRun",
-      action: next_step.action,
-      args: {
-        action: next_step.action,
-        detailServerName: options.serverName,
-        ...(runId ? { runId } : {}),
-      },
-    },
-  ];
-  if (next_step.action === "getDeployRecords") {
-    nextActions.push({
-      tool: "queryCloudRun",
-      action: "getProcessLog",
-      args: {
-        action: "getProcessLog",
-        detailServerName: options.serverName,
-      },
-    });
-  }
-
-  const message =
-    options.reason === "image_no_build"
-      ? `Service '${options.serverName}' has no cloud source build (BuildId=0). Skip getDeployLog; use queryCloudRun(action="getProcessLog"${runId ? `, runId="${runId}"` : ""}) for deploy-step and runtime logs.`
-      : `getDeployLog (DescribeCloudRunBuildLog) failed because this account is not a CODING user. Do not retry getDeployLog. Use queryCloudRun(action="getProcessLog", detailServerName="${options.serverName}"${runId ? `, runId="${runId}"` : ""}) — RunId comes from getDeployRecords/latestDeploy.`;
-
-  return {
-    success: false,
-    error:
-      options.reason === "image_no_build"
-        ? "NO_CODING_BUILD_FOR_IMAGE_DEPLOY"
-        : "CODING_BUILD_LOG_UNAVAILABLE",
-    message,
-    nextActions,
-    data: {
-      ...(runId ? { runId } : {}),
-      next_step,
-      ...(options.upstreamError ? { upstreamError: options.upstreamError } : {}),
-    },
-  };
-}
-
 function extractServerManageTaskInfo(resp: unknown): {
   taskId?: number;
   taskStatus?: string;
@@ -1290,62 +1168,13 @@ export function registerCloudRunTools(server: ExtendedMcpServer) {
             }
 
             const buildId = input.buildId ?? latestDeploy.BuildId;
-            const latestRunId = isValidCloudRunRunId(latestDeploy.RunId)
-              ? latestDeploy.RunId.trim()
-              : undefined;
-
-            // Image deploys typically have BuildId=0 and no CODING build.
-            if (!isValidCloudRunBuildId(buildId)) {
-              return {
-                content: [
-                  {
-                    type: "text",
-                    text: JSON.stringify(
-                      buildGetDeployLogCodingFallback({
-                        serverName,
-                        runId: latestRunId,
-                        reason: "image_no_build",
-                      }),
-                      null,
-                      2,
-                    ),
-                  },
-                ],
-              };
-            }
-
             // Build log (CODING / DescribeCloudRunBuildLog). Meaningful only for
-            // cloud source builds. Accounts without a CODING user fail here —
-            // rewrite to getProcessLog instead of bubbling the raw English error.
-            let buildLogResult: unknown;
-            try {
-              buildLogResult = await cloudrunService.getBuildLog({
-                serverName,
-                buildId,
-              });
-            } catch (error) {
-              if (isCloudRunCodingBuildLogError(error)) {
-                const upstreamError = error instanceof Error ? error.message : String(error);
-                return {
-                  content: [
-                    {
-                      type: "text",
-                      text: JSON.stringify(
-                        buildGetDeployLogCodingFallback({
-                          serverName,
-                          runId: latestRunId,
-                          upstreamError,
-                          reason: "coding",
-                        }),
-                        null,
-                        2,
-                      ),
-                    },
-                  ],
-                };
-              }
-              throw error;
-            }
+            // cloud source builds; image deploys have no build process. Accounts
+            // without a CODING user may fail here — use getProcessLog for runtime logs.
+            const buildLogResult: any = await cloudrunService.getBuildLog({
+              serverName,
+              buildId,
+            });
 
             let processLogs: unknown[] = [];
             let processLogsWarning: string | undefined;
@@ -1361,11 +1190,7 @@ export function registerCloudRunTools(server: ExtendedMcpServer) {
               }
             }
 
-            const buildLogRecord =
-              buildLogResult && typeof buildLogResult === "object"
-                ? (buildLogResult as { Log?: { Text?: string } })
-                : undefined;
-            const buildLogText = typeof buildLogRecord?.Log?.Text === 'string' ? buildLogRecord.Log.Text : '';
+            const buildLogText = typeof buildLogResult?.Log?.Text === 'string' ? buildLogResult.Log.Text : '';
             const processLogText = Array.isArray(processLogs) && processLogs.length > 0 ? normalizeProcessLogText(processLogs) : '';
             const combinedLogText = [buildLogText, processLogText].filter(Boolean).join('\n');
 
@@ -1378,7 +1203,7 @@ export function registerCloudRunTools(server: ExtendedMcpServer) {
                     data: {
                       buildId,
                       deployRecord: latestDeploy,
-                      buildLog: buildLogRecord?.Log || null,
+                      buildLog: buildLogResult?.Log || null,
                       // Optional best-effort attach; prefer dedicated getProcessLog for runtime diagnosis
                       processLogs,
                       combinedLogText,