draftify-cli 1.0.13 → 1.0.17

package/dist/repl.js

@@ -1079,6 +1079,9 @@ async function startRepl(initialUsername) {
                                 catch (err) {
                                     ui_1.ui.error(`Command failed:\n${err}`);
                                     commandOutputs.push(`Command: ${cmdToRun}\nFailed with error:\n${err}`);
+                                    if (err === "Command aborted by user." || err?.name === "AbortError" || err?.message === "Command aborted by user.") {
+                                        throw new Error("Aborted");
+                                    }
                                 }
                             }
                         }

package/dist/utils/api.js

@@ -85,23 +85,44 @@ Always use these tags when you write code or ask questions so the CLI can apply
 CRITICAL RULE: If the user's request is too broad, underspecified, or ambiguous (e.g., "Create a beautiful landing page", "Make a website" without further details), YOU MUST NOT generate any code. Instead, you MUST use the <ASK_QUESTIONS> tag to ask 2-3 clarifying questions (about design, framework, functionality, target audience, etc.). Wait for the user's answers before making file modifications.
 
 IMPORTANT: Do NOT include your own properties, name ('Draftify'), or AI identity in the code you generate (e.g., when creating a discord bot, landing page, or admin panel). Do not use 'Draftify' as a brand name or prefix in generated projects. If a fictional brand or name is needed, invent a new, unique one instead.`;
-        const responseStream = await ai.models.generateContentStream({
-            model: geminiModel,
-            contents: contents,
-            config: {
-                systemInstruction: systemInstruction
+        if (abortSignal?.aborted)
+            throw new Error("Aborted");
+        const fullResult = await new Promise(async (resolve, reject) => {
+            const onAbort = () => reject(new Error("Aborted"));
+            if (abortSignal) {
+                abortSignal.addEventListener("abort", onAbort);
             }
-        });
-        let fullResult = "";
-        for await (const chunk of responseStream) {
-            if (abortSignal?.aborted)
-                throw new Error("Aborted");
-            if (chunk.text) {
-                fullResult += chunk.text;
-                if (onChunk)
-                    onChunk(chunk.text);
+            try {
+                const responseStream = await ai.models.generateContentStream({
+                    model: geminiModel,
+                    contents: contents,
+                    config: {
+                        systemInstruction: systemInstruction
+                    }
+                });
+                let tempResult = "";
+                for await (const chunk of responseStream) {
+                    if (abortSignal?.aborted) {
+                        reject(new Error("Aborted"));
+                        return;
+                    }
+                    if (chunk.text) {
+                        tempResult += chunk.text;
+                        if (onChunk)
+                            onChunk(chunk.text);
+                    }
+                }
+                resolve(tempResult);
             }
-        }
+            catch (err) {
+                reject(err);
+            }
+            finally {
+                if (abortSignal) {
+                    abortSignal.removeEventListener("abort", onAbort);
+                }
+            }
+        });
         // Rough estimation of tokens
         const estimatedTokens = Math.ceil((JSON.stringify(contents).length + fullResult.length) / 4);
         (0, config_1.addTokensUsed)(estimatedTokens);
@@ -132,6 +153,10 @@ IMPORTANT: Do NOT include your own properties, name ('Draftify'), or AI identity
     let buffer = "";
     let fullResult = "";
     while (true) {
+        if (abortSignal?.aborted) {
+            reader.cancel().catch(() => { });
+            throw new Error("Aborted");
+        }
         const { done, value } = await reader.read();
         if (done)
             break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "draftify-cli",
-  "version": "1.0.13",
+  "version": "1.0.17",
   "description": "Draftify AI CLI tool",
   "main": "dist/index.js",
   "bin": {
@@ -38,5 +38,8 @@
   "devDependencies": {
     "@types/node": "^20.14.2",
     "typescript": "^5.4.5"
+  },
+  "overrides": {
+    "uuid": "^11.0.0"
   }
 }