codeep 1.2.1 → 1.2.2

package/dist/renderer/main.js

@@ -501,50 +501,51 @@ async function runSkill(nameOrShortcut, args) {
     const params = parseSkillArgs(args.join(' '), skill);
     app.addMessage({ role: 'user', content: `/${skill.name}${args.length ? ' ' + args.join(' ') : ''}` });
     trackSkillUsage(skill.name);
-    const { execSync } = await import('child_process');
+    const { spawnSync } = await import('child_process');
     try {
         const result = await executeSkill(skill, params, {
             onCommand: async (cmd) => {
-                try {
-                    const output = execSync(cmd, {
-                        cwd: projectPath || process.cwd(),
-                        encoding: 'utf-8',
-                        timeout: 60000,
-                        stdio: ['pipe', 'pipe', 'pipe'],
-                    });
-                    const result = output.trim();
-                    if (result) {
-                        app.addMessage({ role: 'system', content: `\`${cmd}\`\n\`\`\`\n${result}\n\`\`\`` });
+                // Use spawnSync via shell for reliable stdout+stderr capture
+                const proc = spawnSync(cmd, {
+                    cwd: projectPath || process.cwd(),
+                    encoding: 'utf-8',
+                    timeout: 60000,
+                    shell: true,
+                    stdio: ['pipe', 'pipe', 'pipe'],
+                });
+                const stdout = (proc.stdout || '').trim();
+                const stderr = (proc.stderr || '').trim();
+                const output = stdout || stderr || '';
+                if (proc.status === 0) {
+                    if (output) {
+                        app.addMessage({ role: 'system', content: `\`${cmd}\`\n\`\`\`\n${output}\n\`\`\`` });
                     }
-                    return result;
+                    return output;
                 }
-                catch (err) {
-                    const error = err;
-                    const stderr = (error.stderr || '').trim();
-                    const stdout = (error.stdout || '').trim();
-                    // Git commands output progress/info to stderr even on success
-                    if (error.status === 0 || stderr.includes('up-to-date') || stderr.includes('up to date') || stderr.includes('Already up to date')) {
-                        const result = stdout || stderr;
-                        if (result) {
-                            app.addMessage({ role: 'system', content: `\`${cmd}\`\n\`\`\`\n${result}\n\`\`\`` });
-                        }
-                        return result;
-                    }
-                    const errOutput = stderr || stdout;
-                    if (errOutput) {
-                        app.addMessage({ role: 'system', content: `\`${cmd}\` failed:\n\`\`\`\n${errOutput}\n\`\`\`` });
-                    }
-                    throw new Error(errOutput || error.message || 'Command failed');
+                // Non-zero exit
+                if (output) {
+                    app.addMessage({ role: 'system', content: `\`${cmd}\` failed:\n\`\`\`\n${output}\n\`\`\`` });
                 }
+                throw new Error(output || `Command exited with code ${proc.status}`);
             },
-            onPrompt: (prompt) => {
-                return new Promise((resolve, reject) => {
-                    handleSubmit(prompt).then(() => {
-                        // The AI response will be displayed in chat.
-                        // We resolve with an empty string since the response is already shown.
-                        resolve('');
-                    }).catch(reject);
-                });
+            onPrompt: async (prompt) => {
+                try {
+                    app.addMessage({ role: 'user', content: prompt });
+                    app.startStreaming();
+                    const history = app.getChatHistory();
+                    const response = await chat(prompt, history, (chunk) => {
+                        app.addStreamChunk(chunk);
+                    }, undefined, projectContext, undefined);
+                    app.endStreaming();
+                    // Return the AI response text for use in subsequent steps
+                    const lastMsg = app.getMessages();
+                    const assistantMsg = lastMsg[lastMsg.length - 1];
+                    return (assistantMsg?.role === 'assistant' ? assistantMsg.content : response || '').trim();
+                }
+                catch (err) {
+                    app.endStreaming();
+                    throw err;
+                }
             },
             onAgent: (task) => {
                 return new Promise((resolve, reject) => {

package/dist/utils/skills.js

@@ -20,9 +20,10 @@ const BUILT_IN_SKILLS = [
             { name: 'message', description: 'Optional commit message (skips AI generation)', required: false },
         ],
         steps: [
-            { type: 'prompt', content: 'Analyze the git diff and generate a conventional commit message following this format: type(scope): description. Types: feat, fix, docs, style, refactor, test, chore. Be concise.' },
+            { type: 'command', content: 'git diff --cached --stat || git diff --stat' },
+            { type: 'prompt', content: 'Based on this git diff, generate ONLY a conventional commit message (no explanation, no markdown). Format: type(scope): description. Types: feat, fix, docs, style, refactor, test, chore. Be concise. One line only.\n\n${_prev}' },
             { type: 'confirm', content: 'Commit with this message?' },
-            { type: 'command', content: 'git add -A && git commit -m "${message}"' },
+            { type: 'command', content: 'git add -A && git commit -m "${_prev}"' },
             { type: 'notify', content: 'Changes committed successfully!' },
         ],
     },
@@ -707,6 +708,23 @@ export function parseSkillArgs(args, skill) {
     }
     return result;
 }
+/**
+ * Sanitize text for safe use inside shell commands.
+ * Strips markdown formatting and escapes double quotes.
+ */
+function sanitizeForShell(text) {
+    return text
+        // Strip markdown code blocks
+        .replace(/```[\s\S]*?```/g, '')
+        // Strip inline backticks
+        .replace(/`([^`]*)`/g, '$1')
+        // Strip bold/italic markers
+        .replace(/\*{1,3}([^*]+)\*{1,3}/g, '$1')
+        // Take only the first non-empty line (commit messages should be one line)
+        .split('\n').map(l => l.trim()).filter(Boolean)[0] || text.trim()
+        // Escape double quotes for shell safety
+        .replace(/"/g, '\\"');
+}
 /**
  * Interpolate parameters into skill step content
  */
@@ -778,7 +796,9 @@ export async function executeSkill(skill, params, callbacks) {
     let lastOutput = '';
     for (const step of skill.steps) {
         // Interpolate params and ${_prev} into step content
-        const allParams = { ...params, _prev: lastOutput };
+        // For command steps, sanitize _prev for safe shell usage
+        const sanitizedPrev = step.type === 'command' ? sanitizeForShell(lastOutput) : lastOutput;
+        const allParams = { ...params, _prev: sanitizedPrev };
         const content = interpolateParams(step.content, allParams);
         try {
             let result = '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeep",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "AI-powered coding assistant built for the terminal. Multiple LLM providers, project-aware context, and a seamless development workflow.",
   "type": "module",
   "main": "dist/index.js",