chore: simplify error messages

Author: qorzj

packages/cli/src/plus-setup.ts

@@ -54,7 +54,7 @@ export async function runPlusSetup(
     try {
       key = normalizePlusApiKey(answer)!;
     } catch {
-      fail('Invalid API Key format. Expected "sk-" followed by 24 or 26 characters.');
+      fail("Invalid API Key format.");
       return 1;
     }
 

packages/core/src/common/plus-subscription.ts

@@ -17,7 +17,7 @@ export function normalizePlusApiKey(
   const key = typeof value === "string" ? value.trim() : "";
   const length = Array.from(key.slice(3)).length;
   if (!key.startsWith("sk-") || (length !== 24 && length !== 26)) {
-    throw new Error(`Invalid PLUS_API_KEY in ${settingsPath}: expected "sk-" followed by 24 or 26 characters.`);
+    throw new Error(`Invalid PLUS_API_KEY in ${settingsPath}.`);
   }
   return key;
 }

packages/core/src/settings-diagnostics.ts

@@ -252,7 +252,7 @@ export function inspectSettings(options: {
         status: "FAIL",
         name: "Effective settings",
         detail: message.includes("PLUS_API_KEY")
-          ? `Invalid PLUS_API_KEY at ${(trace.sources["env.PLUS_API_KEY"] ?? []).map(sourceName).join(", ")}. Expected sk- followed by 24 or 26 characters.`
+          ? `Invalid PLUS_API_KEY at ${(trace.sources["env.PLUS_API_KEY"] ?? []).map(sourceName).join(", ")}.`
           : /retain|retention|context window|compaction/i.test(message)
             ? message
             : "Unable to resolve settings. Check field types in the files above.",
@@ -292,7 +292,7 @@ export function inspectSettings(options: {
     checks.push({
       status: "FAIL",
       name: "Plus configuration",
-      detail: `${plusPath}: invalid PLUS_API_KEY. Expected sk- followed by 24 or 26 characters.`,
+      detail: `${plusPath}: invalid PLUS_API_KEY.`,
     });
   }
   // The independent Plus file may be unused, but still diagnose malformed keys in it.

packages/core/src/tests/plus-api.test.ts

@@ -82,7 +82,7 @@ test("configured invalid values fail for every subscription plan without reveali
       assert.throws(
         () => readDeepcodePlusSettings(file),
         (error: Error) => {
-          assert.match(error.message, /Invalid PLUS_API_KEY.*settings.json.*24 or 26/);
+          assert.equal(error.message, `Invalid PLUS_API_KEY in ${file}.`);
           if (typeof value === "string" && value.trim()) assert.ok(!error.message.includes(value));
           return true;
         }

packages/core/templates/skills/bundled/image-generator/scripts/image_generator.py

@@ -30,10 +30,10 @@ def resolve_host(api_key=None):
     if api_key is None:
         return 'https://deepcode.vegamo.cn'
     if not isinstance(api_key, str):
-        raise ImageGeneratorError('Invalid PLUS_API_KEY: expected "sk-" followed by 24 or 26 characters.')
+        raise ImageGeneratorError('Invalid PLUS_API_KEY.')
     key = api_key.strip()
     if not key.startswith('sk-') or len(key[3:]) not in (24, 26):
-        raise ImageGeneratorError('Invalid PLUS_API_KEY: expected "sk-" followed by 24 or 26 characters.')
+        raise ImageGeneratorError('Invalid PLUS_API_KEY.')
     return ('https://www.deepcodeplus.com' if len(key[3:]) == 26
             else 'https://deepcode.vegamo.cn')
 
@@ -55,7 +55,7 @@ def load_plus_api_key(settings_path: Path, required: bool = True) -> str | None:
     key = env['PLUS_API_KEY']
     try:
         if not isinstance(key, str):
-            raise ImageGeneratorError('Invalid PLUS_API_KEY: expected "sk-" followed by 24 or 26 characters.')
+            raise ImageGeneratorError('Invalid PLUS_API_KEY.')
         resolve_host(key)
     except ImageGeneratorError as exc:
         raise ImageGeneratorError(f'{exc} Settings: {settings_path}') from exc

packages/core/templates/skills/bundled/video-generator/scripts/video_generator.py

@@ -43,10 +43,10 @@ def resolve_host(api_key=None):
     if api_key is None:
         return 'https://deepcode.vegamo.cn'
     if not isinstance(api_key, str):
-        raise VideoError('Invalid PLUS_API_KEY: expected "sk-" followed by 24 or 26 characters.')
+        raise VideoError('Invalid PLUS_API_KEY.')
     key = api_key.strip()
     if not key.startswith('sk-') or len(key[3:]) not in (24, 26):
-        raise VideoError('Invalid PLUS_API_KEY: expected "sk-" followed by 24 or 26 characters.')
+        raise VideoError('Invalid PLUS_API_KEY.')
     return ('https://www.deepcodeplus.com' if len(key[3:]) == 26
             else 'https://deepcode.vegamo.cn')
 
@@ -68,7 +68,7 @@ def load_key(settings_path, required=True):
     key = env['PLUS_API_KEY']
     try:
         if key is None:
-            raise VideoError('Invalid PLUS_API_KEY: expected "sk-" followed by 24 or 26 characters.')
+            raise VideoError('Invalid PLUS_API_KEY.')
         resolve_host(key)
     except VideoError as exc:
         raise VideoError(f'{exc} Settings: {settings_path}') from exc