ai-cmg 0.1.3 → 0.1.5

package/README.md

@@ -81,7 +81,24 @@ export default {
 
     try {
       // 3. Parse request data (diff, hint, prompt)
-      const { diff, hint, prompt } = await request.json();
+      let requestData;
+      try {
+        requestData = await request.json();
+      } catch (parseError) {
+        console.error('JSON parse error:', parseError);
+        return new Response(
+          JSON.stringify({
+            error: 'Invalid request format',
+            details: 'Failed to parse request body as JSON.'
+          }),
+          {
+            status: 400,
+            headers: { 'Content-Type': 'application/json' }
+          }
+        );
+      }
+
+      const { diff, hint, prompt } = requestData;
 
       if (!diff) {
         return new Response(JSON.stringify({ error: 'Diff data is missing' }), { status: 400 });
@@ -145,20 +162,82 @@ export default {
       }
 
       // 5. Run AI model
-      const response = await env.AI.run(model, {
-        messages: [
-          { role: 'system', content: systemInstruction },
-          { role: 'user', content: diff }
-        ]
-      });
+      let response;
+      try {
+        response = await env.AI.run(model, {
+          messages: [
+            { role: 'system', content: systemInstruction },
+            { role: 'user', content: diff }
+          ]
+        });
+      } catch (aiError) {
+        console.error('AI model error:', aiError);
+        const errorMessage = aiError?.message || String(aiError);
+        
+        // Check for context length exceeded error
+        const isContextLengthError = errorMessage.includes('maximum context length') || 
+                                     errorMessage.includes('3030') ||
+                                     errorMessage.includes('context length');
+        
+        if (isContextLengthError) {
+          return new Response(
+            JSON.stringify({
+              error: 'Context length exceeded',
+              details: errorMessage,
+              hint: 'The diff is too large. Please reduce the number of staged changes or split into multiple commits. The CLI should automatically truncate large diffs, but you may need to stage fewer files.'
+            }),
+            {
+              status: 400,
+              headers: { 'Content-Type': 'application/json' }
+            }
+          );
+        }
+        
+        return new Response(
+          JSON.stringify({
+            error: 'AI model error',
+            details: errorMessage,
+            hint: 'Check if the model is available and your Workers AI quota is sufficient.'
+          }),
+          {
+            status: 500,
+            headers: { 'Content-Type': 'application/json' }
+          }
+        );
+      }
+
+      if (!response || !response.response) {
+        console.error('Invalid AI response:', response);
+        return new Response(
+          JSON.stringify({
+            error: 'Invalid AI response',
+            details: 'The AI model returned an unexpected response format.'
+          }),
+          {
+            status: 500,
+            headers: { 'Content-Type': 'application/json' }
+          }
+        );
+      }
 
       return Response.json({ message: response.response });
 
     } catch (error) {
-      return new Response(JSON.stringify({ error: error.message }), {
-        status: 500,
-        headers: { 'Content-Type': 'application/json' }
-      });
+      console.error('Worker error:', error);
+      const errorMessage = error?.message || String(error);
+      const errorStack = error?.stack;
+      
+      return new Response(
+        JSON.stringify({
+          error: 'Server error',
+          details: errorMessage,
+          ...(errorStack && { stack: errorStack })
+        }),
+        {
+          status: 500,
+          headers: { 'Content-Type': 'application/json' }
+        }
+      );
     }
   }
 };

package/dist/index.js

@@ -23,7 +23,7 @@ const LOCK_FILES = new Set([
 const GENERATED_PREFIXES = ['dist/', 'build/', '.next/', 'coverage/', 'node_modules/'];
 const MAX_BLOCK_LINES = 400;
 const MAX_BLOCK_CHARS = 20000;
-const MAX_INPUT_CHARS = 200000;
+const MAX_INPUT_CHARS = 60000;
 function getPackageVersion() {
     try {
         const currentFile = fileURLToPath(import.meta.url);
@@ -378,10 +378,63 @@ function limitDiffSize(diff) {
     if (diff.length <= MAX_INPUT_CHARS) {
         return { diff, truncated: false };
     }
-    const trimmed = diff.slice(0, MAX_INPUT_CHARS);
+    // Split by file blocks to preserve context - keep file boundaries intact
+    const blocks = diff.split(/^diff --git /m);
+    const keptBlocks = [];
+    const truncatedFiles = [];
+    let currentLength = 0;
+    let isFirstBlock = true;
+    // Preserve existing summary header if present
+    const headerMatch = diff.match(/^(# Omitted file contents \(summarized\)\n.+?\n\n)/s);
+    if (headerMatch) {
+        const header = headerMatch[1];
+        keptBlocks.push(header.trim());
+        currentLength = header.length;
+        isFirstBlock = false;
+    }
+    for (const block of blocks) {
+        if (!block.trim())
+            continue;
+        const headerLine = block.split('\n')[0] ?? '';
+        const match = headerLine.match(/^a\/(.+?) b\/(.+?)$/);
+        const fullBlock = isFirstBlock ? block : `diff --git ${block}`;
+        const blockLength = fullBlock.length;
+        isFirstBlock = false;
+        if (match) {
+            const aPath = match[1];
+            const bPath = match[2];
+            const filePath = bPath === '/dev/null' ? aPath : bPath;
+            // Check if this block is already summarized (from summarizeDiff)
+            const isAlreadySummarized = fullBlock.includes('# content omitted');
+            // Check if adding this block would exceed limit
+            if (!isAlreadySummarized && currentLength + blockLength > MAX_INPUT_CHARS) {
+                // Truncate: replace full diff with summary
+                truncatedFiles.push({ path: filePath });
+                const summaryBlock = `diff --git a/${aPath} b/${bPath}\n# content truncated due to size limit\n`;
+                keptBlocks.push(summaryBlock);
+                currentLength += summaryBlock.length;
+            }
+            else {
+                // Include full block (either fits, or already summarized)
+                keptBlocks.push(fullBlock);
+                currentLength += blockLength;
+            }
+        }
+        else {
+            // Non-file block (should be rare), include if space allows
+            if (currentLength + blockLength <= MAX_INPUT_CHARS) {
+                keptBlocks.push(fullBlock);
+                currentLength += blockLength;
+            }
+        }
+    }
+    // Add summary of truncated files if any
+    const truncatedSummary = truncatedFiles.length > 0
+        ? `\n\n# Additional files truncated due to size limit (${truncatedFiles.length} file${truncatedFiles.length > 1 ? 's' : ''})\n${truncatedFiles.map(f => `- ${f.path}`).join('\n')}`
+        : '';
     return {
-        diff: `${trimmed}\n\n# diff truncated due to size limit\n`,
-        truncated: true
+        diff: `${keptBlocks.join('\n')}${truncatedSummary}`.trim(),
+        truncated: truncatedFiles.length > 0
     };
 }
 async function main() {
@@ -486,7 +539,23 @@ async function main() {
             return;
         }
         if (!response.ok) {
-            throw new Error(`Server Error: ${response.status}`);
+            let errorMessage = `Server Error: ${response.status}`;
+            try {
+                const errorData = await response.json();
+                if (errorData.error) {
+                    errorMessage = errorData.error;
+                    if (errorData.details) {
+                        errorMessage += `\nDetails: ${errorData.details}`;
+                    }
+                    if (errorData.hint) {
+                        errorMessage += `\nHint: ${errorData.hint}`;
+                    }
+                }
+            }
+            catch {
+                // If JSON parsing fails, use the default error message
+            }
+            throw new Error(errorMessage);
         }
         const { message } = await response.json();
         // 5. 결과 출력 및 액션 선택

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-cmg",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "AI Commit Message Generator",
   "type": "module",
   "bin": {