@qelos/aidev 0.2.1 → 0.2.3

package/dist/ai/cursor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cursor.d.ts","sourceRoot":"","sources":["../../src/ai/cursor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAI/C,qBAAa,YAAa,YAAW,QAAQ;IAC3C,QAAQ,CAAC,IAAI,YAAY;IAEzB,WAAW,IAAI,OAAO;IAIhB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;CA8BhE"}
+{"version":3,"file":"cursor.d.ts","sourceRoot":"","sources":["../../src/ai/cursor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAI/C,qBAAa,YAAa,YAAW,QAAQ;IAC3C,QAAQ,CAAC,IAAI,YAAY;IAEzB,WAAW,IAAI,OAAO;IAIhB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;CA8BhE"}

package/dist/ai/cursor.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CursorRunner = void 0;
-const node_child_process_1 = require("node:child_process");
 const logger_1 = require("../logger");
 const platform_1 = require("../platform");
 class CursorRunner {
@@ -16,7 +15,7 @@ class CursorRunner {
         logger_1.logger.info('Running Cursor Agent...');
         logger_1.logger.debug(`Prompt: ${fullPrompt.slice(0, 200)}...`);
         const cwd = process.cwd();
-        const result = (0, node_child_process_1.spawnSync)('agent', ['--print', '--force', '--trust', '--workspace', cwd, fullPrompt], {
+        const result = (0, platform_1.spawnCommand)('agent', ['--print', '--force', '--trust', '--workspace', cwd, fullPrompt], {
             encoding: 'utf8',
             timeout: 10 * 60 * 1000,
             cwd,

package/dist/ai/cursor.js.map

@@ -1 +1 @@
-{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../src/ai/cursor.ts"],"names":[],"mappings":";;;AAAA,2DAA+C;AAE/C,sCAAmC;AACnC,0CAA6D;AAE7D,MAAa,YAAY;IAAzB;QACW,SAAI,GAAG,QAAQ,CAAC;IAoC3B,CAAC;IAlCC,WAAW;QACT,OAAO,IAAA,wBAAa,EAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,MAAc,EAAE,KAAc;QACtC,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,4BAA4B,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;QAEjF,eAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACvC,eAAM,CAAC,KAAK,CAAC,WAAW,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;QAEvD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,IAAA,8BAAS,EACtB,OAAO,EACP,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,EAAE,UAAU,CAAC,EACjE;YACE,QAAQ,EAAE,MAAM;YAChB,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI;YACvB,GAAG;YACH,GAAG,EAAE,IAAA,0BAAe,GAAE;SACvB,CACF,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;QAElC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,eAAM,CAAC,IAAI,CAAC,mCAAmC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YAChE,IAAI,KAAK;gBAAE,eAAM,CAAC,IAAI,CAAC,kBAAkB,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;YAChE,IAAI,MAAM,CAAC,KAAK;gBAAE,eAAM,CAAC,IAAI,CAAC,uBAAuB,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/E,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACpC,CAAC;CACF;AArCD,oCAqCC"}
+{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../src/ai/cursor.ts"],"names":[],"mappings":";;;AACA,sCAAmC;AACnC,0CAA2E;AAE3E,MAAa,YAAY;IAAzB;QACW,SAAI,GAAG,QAAQ,CAAC;IAoC3B,CAAC;IAlCC,WAAW;QACT,OAAO,IAAA,wBAAa,EAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,MAAc,EAAE,KAAc;QACtC,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,4BAA4B,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;QAEjF,eAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACvC,eAAM,CAAC,KAAK,CAAC,WAAW,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;QAEvD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,IAAA,uBAAY,EACzB,OAAO,EACP,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,EAAE,UAAU,CAAC,EACjE;YACE,QAAQ,EAAE,MAAM;YAChB,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI;YACvB,GAAG;YACH,GAAG,EAAE,IAAA,0BAAe,GAAE;SACvB,CACF,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;QAElC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,eAAM,CAAC,IAAI,CAAC,mCAAmC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YAChE,IAAI,KAAK;gBAAE,eAAM,CAAC,IAAI,CAAC,kBAAkB,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;YAChE,IAAI,MAAM,CAAC,KAAK;gBAAE,eAAM,CAAC,IAAI,CAAC,uBAAuB,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/E,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACpC,CAAC;CACF;AArCD,oCAqCC"}

package/dist/ai/windsurf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"windsurf.d.ts","sourceRoot":"","sources":["../../src/ai/windsurf.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAI/C,qBAAa,cAAe,YAAW,QAAQ;IAC7C,QAAQ,CAAC,IAAI,cAAc;IAE3B,WAAW,IAAI,OAAO;IAIhB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;CA8BhE"}
+{"version":3,"file":"windsurf.d.ts","sourceRoot":"","sources":["../../src/ai/windsurf.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAI/C,qBAAa,cAAe,YAAW,QAAQ;IAC7C,QAAQ,CAAC,IAAI,cAAc;IAE3B,WAAW,IAAI,OAAO;IAIhB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;CA8BhE"}

package/dist/ai/windsurf.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WindsurfRunner = void 0;
-const node_child_process_1 = require("node:child_process");
 const logger_1 = require("../logger");
 const platform_1 = require("../platform");
 class WindsurfRunner {
@@ -16,7 +15,7 @@ class WindsurfRunner {
         logger_1.logger.info('Running Windsurf...');
         logger_1.logger.debug(`Prompt: ${fullPrompt.slice(0, 200)}...`);
         const cwd = process.cwd();
-        const result = (0, node_child_process_1.spawnSync)('windsurf', ['--agent', '--print', '--trust', '--workspace', cwd, fullPrompt], {
+        const result = (0, platform_1.spawnCommand)('windsurf', ['--agent', '--print', '--trust', '--workspace', cwd, fullPrompt], {
             encoding: 'utf8',
             timeout: 10 * 60 * 1000,
             cwd,

package/dist/ai/windsurf.js.map

@@ -1 +1 @@
-{"version":3,"file":"windsurf.js","sourceRoot":"","sources":["../../src/ai/windsurf.ts"],"names":[],"mappings":";;;AAAA,2DAA+C;AAE/C,sCAAmC;AACnC,0CAA6D;AAE7D,MAAa,cAAc;IAA3B;QACW,SAAI,GAAG,UAAU,CAAC;IAoC7B,CAAC;IAlCC,WAAW;QACT,OAAO,IAAA,wBAAa,EAAC,UAAU,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,MAAc,EAAE,KAAc;QACtC,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,4BAA4B,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;QAEjF,eAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACnC,eAAM,CAAC,KAAK,CAAC,WAAW,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;QAEvD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,IAAA,8BAAS,EACtB,UAAU,EACV,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,EAAE,UAAU,CAAC,EACjE;YACE,QAAQ,EAAE,MAAM;YAChB,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI;YACvB,GAAG;YACH,GAAG,EAAE,IAAA,0BAAe,GAAE;SACvB,CACF,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;QAElC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,eAAM,CAAC,IAAI,CAAC,+BAA+B,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YAC5D,IAAI,KAAK;gBAAE,eAAM,CAAC,IAAI,CAAC,oBAAoB,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;YAClE,IAAI,MAAM,CAAC,KAAK;gBAAE,eAAM,CAAC,IAAI,CAAC,yBAAyB,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACjF,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACpC,CAAC;CACF;AArCD,wCAqCC"}
+{"version":3,"file":"windsurf.js","sourceRoot":"","sources":["../../src/ai/windsurf.ts"],"names":[],"mappings":";;;AACA,sCAAmC;AACnC,0CAA2E;AAE3E,MAAa,cAAc;IAA3B;QACW,SAAI,GAAG,UAAU,CAAC;IAoC7B,CAAC;IAlCC,WAAW;QACT,OAAO,IAAA,wBAAa,EAAC,UAAU,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,MAAc,EAAE,KAAc;QACtC,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,4BAA4B,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;QAEjF,eAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACnC,eAAM,CAAC,KAAK,CAAC,WAAW,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;QAEvD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,IAAA,uBAAY,EACzB,UAAU,EACV,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,EAAE,UAAU,CAAC,EACjE;YACE,QAAQ,EAAE,MAAM;YAChB,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI;YACvB,GAAG;YACH,GAAG,EAAE,IAAA,0BAAe,GAAE;SACvB,CACF,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;QAElC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,eAAM,CAAC,IAAI,CAAC,+BAA+B,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YAC5D,IAAI,KAAK;gBAAE,eAAM,CAAC,IAAI,CAAC,oBAAoB,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;YAClE,IAAI,MAAM,CAAC,KAAK;gBAAE,eAAM,CAAC,IAAI,CAAC,yBAAyB,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACjF,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACpC,CAAC;CACF;AArCD,wCAqCC"}

package/dist/cli.js

@@ -5,11 +5,13 @@ const commander_1 = require("commander");
 const init_1 = require("./commands/init");
 const run_1 = require("./commands/run");
 const schedule_1 = require("./commands/schedule");
+const tasks_1 = require("./commands/tasks");
 const help_1 = require("./commands/help");
 const stop_1 = require("./commands/stop");
 const config_1 = require("./config");
 const providers_1 = require("./providers");
 const ai_1 = require("./ai");
+const tasks_2 = require("./tasks");
 const logger_1 = require("./logger");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { version } = require('../package.json');
@@ -32,19 +34,15 @@ program
     (0, help_1.helpCommand)();
 });
 async function runWithFilter(filter) {
-    const validFilters = ['all', 'open', 'pending'];
-    const resolvedFilter = filter && validFilters.includes(filter)
-        ? filter
-        : 'all';
+    const validFilters = ['all', 'open', 'pending', 'tasks'];
     if (filter && !validFilters.includes(filter)) {
-        logger_1.logger.error(`Unknown filter: ${filter}. Valid options: all, open, pending`);
+        logger_1.logger.error(`Unknown filter: ${filter}. Valid options: all, open, pending, tasks`);
         process.exit(1);
     }
     try {
         const { env } = program.opts();
         const config = (0, config_1.loadConfig)(env);
         const provider = (0, providers_1.createProvider)(config);
-        const runners = (0, ai_1.createRunners)(config);
         let nonCodeProvider;
         if (config.nonCodeTag) {
             const nonCodeConfig = {
@@ -56,6 +54,15 @@ async function runWithFilter(filter) {
             };
             nonCodeProvider = (0, providers_1.createProvider)(nonCodeConfig);
         }
+        // Always process local tasks (aidev.tasks.json)
+        const localResult = await (0, tasks_2.processLocalTasks)(config, provider, nonCodeProvider);
+        if (localResult.pushed > 0 || localResult.skipped > 0) {
+            logger_1.logger.info(`Local tasks: ${localResult.pushed} pushed, ${localResult.skipped} skipped`);
+        }
+        if (filter === 'tasks')
+            return;
+        const resolvedFilter = filter || 'all';
+        const runners = (0, ai_1.createRunners)(config);
         await (0, run_1.runCommand)(resolvedFilter, config, provider, runners, nonCodeProvider);
     }
     catch (err) {
@@ -102,5 +109,32 @@ scheduleCmd
     .action(() => {
     (0, schedule_1.scheduleFixCommand)();
 });
+const tasksCmd = program
+    .command('tasks')
+    .description('Manage local tasks (aidev.tasks.json)');
+tasksCmd
+    .command('add')
+    .description('Add a new local task (interactive)')
+    .action(async () => {
+    await (0, tasks_1.tasksAddCommand)();
+});
+tasksCmd
+    .command('remove [id]')
+    .description('Remove a local task by table ID (interactive if omitted)')
+    .action(async (id) => {
+    await (0, tasks_1.tasksRemoveCommand)(id);
+});
+tasksCmd
+    .command('ls')
+    .description('List all local tasks')
+    .action(async () => {
+    await (0, tasks_1.tasksLsCommand)();
+});
+tasksCmd
+    .command('update [id]')
+    .description('Update a local task by table ID (interactive if omitted)')
+    .action(async (id) => {
+    await (0, tasks_1.tasksUpdateCommand)(id);
+});
 program.parse(process.argv);
 //# sourceMappingURL=cli.js.map

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;AACA,yCAAoC;AACpC,0CAA8C;AAC9C,wCAAuD;AACvD,kDAAwH;AACxH,4CAA2G;AAC3G,0CAA8C;AAC9C,0CAA8C;AAC9C,qCAAsC;AACtC,2CAA2D;AAC3D,6BAAqC;AACrC,mCAA4C;AAC5C,qCAAkC;AAGlC,8DAA8D;AAC9D,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAwB,CAAC;AAEtE,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,IAAI,CAAC,OAAO,CAAC;KACb,WAAW,CAAC,2EAA2E,CAAC;KACxF,OAAO,CAAC,OAAO,CAAC;KAChB,MAAM,CAAC,kBAAkB,EAAE,wCAAwC,CAAC,CAAC;AAExE,OAAO;KACJ,OAAO,CAAC,MAAM,CAAC;KACf,WAAW,CAAC,sDAAsD,CAAC;KACnE,MAAM,CAAC,KAAK,IAAI,EAAE;IACjB,MAAM,IAAA,kBAAW,GAAE,CAAC;AACtB,CAAC,CAAC,CAAC;AAEL,OAAO;KACJ,OAAO,CAAC,MAAM,CAAC;KACf,WAAW,CAAC,WAAW,CAAC;KACxB,MAAM,CAAC,GAAG,EAAE;IACX,IAAA,kBAAW,GAAE,CAAC;AAChB,CAAC,CAAC,CAAC;AAEL,KAAK,UAAU,aAAa,CAAC,MAA0B;IACrD,MAAM,YAAY,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAEzD,IAAI,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7C,eAAM,CAAC,KAAK,CAAC,mBAAmB,MAAM,4CAA4C,CAAC,CAAC;QACpF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAoB,CAAC;QACjD,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAG,IAAA,0BAAc,EAAC,MAAM,CAAC,CAAC;QAExC,IAAI,eAAyC,CAAC;QAC9C,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACtB,MAAM,aAAa,GAAW;gBAC5B,GAAG,MAAM;gBACT,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,aAAa,EAAE,MAAM,CAAC,oBAAoB,IAAI,MAAM,CAAC,aAAa;gBAClE,SAAS,EAAE,MAAM,CAAC,UAAU;gBAC5B,WAAW,EAAE,MAAM,CAAC,kBAAkB,IAAI,MAAM,CAAC,WAAW;aAC7D,CAAC;YACF,eAAe,GAAG,IAAA,0BAAc,EAAC,aAAa,CAAC,CAAC;QAClD,CAAC;QAED,gDAAgD;QAChD,MAAM,WAAW,GAAG,MAAM,IAAA,yBAAiB,EAAC,MAAM,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;QAC/E,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,WAAW,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;YACtD,eAAM,CAAC,IAAI,CAAC,gBAAgB,WAAW,CAAC,MAAM,YAAY,WAAW,CAAC,OAAO,UAAU,CAAC,CAAC;QAC3F,CAAC;QAED,IAAI,MAAM,KAAK,OAAO;YAAE,OAAO;QAE/B,MAAM,cAAc,GAAe,MAAoB,IAAI,KAAK,CAAC;QACjE,MAAM,OAAO,GAAG,IAAA,kBAAa,EAAC,MAAM,CAAC,CAAC;QACtC,MAAM,IAAA,gBAAU,EAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;IAC/E,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,eAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,OAAO;KACJ,OAAO,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;KAC5C,WAAW,CAAC,gDAAgD,CAAC;KAC7D,MAAM,CAAC,KAAK,EAAE,MAAe,EAAE,EAAE;IAChC,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEL,OAAO;KACJ,OAAO,CAAC,MAAM,CAAC;KACf,WAAW,CAAC,yDAAyD,CAAC;KACtE,MAAM,CAAC,GAAG,EAAE;IACX,IAAA,kBAAW,GAAE,CAAC;AAChB,CAAC,CAAC,CAAC;AAEL,MAAM,WAAW,GAAG,OAAO;KACxB,OAAO,CAAC,UAAU,CAAC;KACnB,WAAW,CAAC,qDAAqD,CAAC,CAAC;AAEtE,WAAW;KACR,OAAO,CAAC,YAAY,CAAC;KACrB,WAAW,CAAC,yDAAyD,CAAC;KACtE,MAAM,CAAC,KAAK,EAAE,IAAa,EAAE,EAAE;IAC9B,MAAM,IAAA,6BAAkB,EAAC,IAAI,CAAC,CAAC;AACjC,CAAC,CAAC,CAAC;AAEL,WAAW;KACR,OAAO,CAAC,KAAK,CAAC;KACd,WAAW,CAAC,0CAA0C,CAAC;KACvD,MAAM,CAAC,KAAK,IAAI,EAAE;IACjB,MAAM,IAAA,6BAAkB,GAAE,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEL,WAAW;KACR,OAAO,CAAC,aAAa,CAAC;KACtB,WAAW,CAAC,oEAAoE,CAAC;KACjF,MAAM,CAAC,KAAK,EAAE,EAAW,EAAE,EAAE;IAC5B,MAAM,IAAA,gCAAqB,EAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AACjE,CAAC,CAAC,CAAC;AAEL,WAAW;KACR,OAAO,CAAC,KAAK,CAAC;KACd,WAAW,CAAC,kEAAkE,CAAC;KAC/E,MAAM,CAAC,GAAG,EAAE;IACX,IAAA,6BAAkB,GAAE,CAAC;AACvB,CAAC,CAAC,CAAC;AAEL,MAAM,QAAQ,GAAG,OAAO;KACrB,OAAO,CAAC,OAAO,CAAC;KAChB,WAAW,CAAC,uCAAuC,CAAC,CAAC;AAExD,QAAQ;KACL,OAAO,CAAC,KAAK,CAAC;KACd,WAAW,CAAC,oCAAoC,CAAC;KACjD,MAAM,CAAC,KAAK,IAAI,EAAE;IACjB,MAAM,IAAA,uBAAe,GAAE,CAAC;AAC1B,CAAC,CAAC,CAAC;AAEL,QAAQ;KACL,OAAO,CAAC,aAAa,CAAC;KACtB,WAAW,CAAC,0DAA0D,CAAC;KACvE,MAAM,CAAC,KAAK,EAAE,EAAW,EAAE,EAAE;IAC5B,MAAM,IAAA,0BAAkB,EAAC,EAAE,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC;AAEL,QAAQ;KACL,OAAO,CAAC,IAAI,CAAC;KACb,WAAW,CAAC,sBAAsB,CAAC;KACnC,MAAM,CAAC,KAAK,IAAI,EAAE;IACjB,MAAM,IAAA,sBAAc,GAAE,CAAC;AACzB,CAAC,CAAC,CAAC;AAEL,QAAQ;KACL,OAAO,CAAC,aAAa,CAAC;KACtB,WAAW,CAAC,0DAA0D,CAAC;KACvE,MAAM,CAAC,KAAK,EAAE,EAAW,EAAE,EAAE;IAC5B,MAAM,IAAA,0BAAkB,EAAC,EAAE,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC;AAEL,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}

package/dist/commands/help.js

@@ -54,7 +54,7 @@ ${b('NON-CODE TASKS')}
   that don't produce code changes requiring review.
   Optionally use a different ClickUp team (${c('NON_CODE_CLICKUP_TEAM_ID')}) or
   Jira project (${c('NON_CODE_JIRA_PROJECT')}) for non-code tasks.
-  If ${c('NON_CODE_TAG')} is not set, non-code tasks are disabled.
+  If ${c('NON_CODE_TAG')} is not set, it defaults to ${d('<folder-name>-other')}.
 
 ${b('EXAMPLES')}
   ${d('$')} ${g('aidev init')}
@@ -66,11 +66,11 @@ ${b('EXAMPLES')}
 ${b('CONFIG')}  ${d('.env.aidev in your project directory')}
   ${d('CLICKUP_API_KEY')}      ClickUp personal API token
   ${d('CLICKUP_TEAM_ID')}      Workspace / team ID
-  ${d('CLICKUP_TAG')}          Tag used to filter tasks
+  ${d('CLICKUP_TAG')}          Tag used to filter tasks ${d('(default: folder name)')}
   ${d('AGENTS')}               Agent order: ${c('claude,cursor')} ${d('| cursor,claude | claude | cursor')}
   ${d('DEV_NOTES_MODE')}       ${c('smart')} ${d('(default) | always')}
   ${d('AIDEV_TRIGGER_WORD')}   Trigger word to re-process a skipped task ${d('(default: aidev-continue)')}
-  ${d('NON_CODE_TAG')}         Tag for non-code tasks ${d('(no git branching)')}
+  ${d('NON_CODE_TAG')}         Tag for non-code tasks ${d('(default: <folder-name>-other)')}
   ${d('GIT_REMOTE')}           Remote name ${d('(auto-detected if unset)')}
   ${d('GITHUB_BASE_BRANCH')}   Base branch ${d('(default: main)')}
   ${d('GITHUB_REPO')}          ${d('owner/repo')} for PR links

package/dist/commands/help.js.map

@@ -1 +1 @@
-{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/commands/help.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/commands/help.ts"],"names":[],"mappings":"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"}

package/dist/commands/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAuBA,wBAAgB,eAAe,CAAC,GAAG,SAAgB,GAAG,IAAI,CAgBzD;AAQD,MAAM,WAAW,OAAO;IACtB,QAAQ,EAAE,SAAS,GAAG,MAAM,CAAC;IAE7B,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;IAE9B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAE3B,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,kBAAkB,EAAE,MAAM,CAAC;IAE3B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;CACxB;AAqHD,2EAA2E;AAC3E,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE1C;AAMD,wBAAgB,SAAS,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,CAsD5C;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CA4BtD;AAED,wBAAsB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CA8OjD"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAwBA,wBAAgB,eAAe,CAAC,GAAG,SAAgB,GAAG,IAAI,CAgBzD;AAQD,MAAM,WAAW,OAAO;IACtB,QAAQ,EAAE,SAAS,GAAG,MAAM,CAAC;IAE7B,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;IAE9B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAE3B,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,kBAAkB,EAAE,MAAM,CAAC;IAE3B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;CACxB;AAqHD,2EAA2E;AAC3E,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE1C;AAMD,wBAAgB,SAAS,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,CAsD5C;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CA4BtD;AAED,wBAAsB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CA8OjD"}

package/dist/commands/init.js

@@ -60,6 +60,7 @@ const GITIGNORE_RULES = [
     ['*.log', /^\*\.log/m],
     ['*.aidev.instructions.md', /^\*\.aidev\.instructions\.md/m],
     ['*.aidev.task.json', /^\*\.aidev\.task\.json/m],
+    ['aidev.tasks.json', /^aidev\.tasks\.json/m],
 ];
 function ensureGitignore(dir = process.cwd()) {
     const gitignorePath = path.join(dir, '.gitignore');
@@ -337,7 +338,7 @@ async function initCommand() {
         section('Non-code tasks');
         console.log(chalk_1.default.dim(`  Tasks with the non-code tag are executed without git branching — no checkout,\n` +
             `  commit, or push. Useful for research, docs, or tasks that don't produce PRs.`));
-        const nonCodeTag = await ask(rl, `Non-code tag ${hint('optional — leave blank to disable')}`, existing.NON_CODE_TAG || '');
+        const nonCodeTag = await ask(rl, `Non-code tag ${hint('leave blank to use default: ' + folderName + '-other')}`, existing.NON_CODE_TAG || `${folderName}-other`);
         let nonCodeClickupTeamId = '';
         let nonCodeJiraProject = '';
         if (nonCodeTag) {

package/dist/commands/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}

package/dist/commands/run.d.ts

@@ -23,6 +23,7 @@ export declare function hasHumanReply(comments: Comment[]): boolean;
  */
 export declare function hasTriggerWord(comments: Comment[], triggerWord: string): boolean;
 export declare function checkNeedsClarification(task: Task, config: Config, provider: TaskProvider, runners: AIRunner[]): Promise<string | null>;
+export declare function buildConflictResolutionPrompt(task: Task, conflictFiles: string[], context: string): string;
 export declare function buildImplementPrompt(task: Task, context: string): string;
 /**
  * Attempts to create a PR via `gh` CLI. Falls back to a compare URL if gh is

package/dist/commands/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAUjC,eAAO,MAAM,oBAAoB,mBAAmB,CAAC;AAErD,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,MAAM,GAAG,SAAS,CAAC;AAEnD,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;CACnD;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,EAAE,CAAC;CACrB;AAgDD,wBAAsB,UAAU,CAC9B,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,QAAQ,EAAE,EACnB,eAAe,CAAC,EAAE,YAAY,GAC7B,OAAO,CAAC,IAAI,CAAC,CA6Cf;AAiFD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAI1D;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAMhF;AA0BD,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,QAAQ,EAAE,GAClB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiDxB;AAqHD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAUxE;AAgTD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,MAAM,CAY9E;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAIjE;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAa5F;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAUtE;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAW5F;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAE5D"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAcjC,eAAO,MAAM,oBAAoB,mBAAmB,CAAC;AAErD,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,MAAM,GAAG,SAAS,CAAC;AAEnD,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;CACnD;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,EAAE,CAAC;CACrB;AAgDD,wBAAsB,UAAU,CAC9B,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,QAAQ,EAAE,EACnB,eAAe,CAAC,EAAE,YAAY,GAC7B,OAAO,CAAC,IAAI,CAAC,CA6Cf;AAiFD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAI1D;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAMhF;AA0BD,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,QAAQ,EAAE,GAClB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiDxB;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CA0B1G;AA6RD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAUxE;AAyUD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,MAAM,CAY9E;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAIjE;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAa5F;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAUtE;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAW5F;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAE5D"}

package/dist/commands/run.js

@@ -38,6 +38,7 @@ exports.runCommand = runCommand;
 exports.hasHumanReply = hasHumanReply;
 exports.hasTriggerWord = hasTriggerWord;
 exports.checkNeedsClarification = checkNeedsClarification;
+exports.buildConflictResolutionPrompt = buildConflictResolutionPrompt;
 exports.buildImplementPrompt = buildImplementPrompt;
 exports.tryCreatePR = tryCreatePR;
 exports.buildPRUrl = buildPRUrl;
@@ -295,6 +296,146 @@ Respond with valid JSON only:
     logger_1.logger.warn('Clarification check failed for all runners — proceeding without clarification');
     return null;
 }
+function buildConflictResolutionPrompt(task, conflictFiles, context) {
+    return `You are resolving merge conflicts in a software development task branch.
+
+The task branch has fallen behind the base branch and has merge conflicts that need to be resolved.
+
+## Task context (DO NOT break this — the task must still work after conflict resolution)
+
+Task: ${task.name}
+
+Description:
+${task.description || '(no description provided)'}
+${context}
+
+## Merge conflicts
+
+The following files have merge conflicts with conflict markers (<<<<<<< HEAD, =======, >>>>>>> ...):
+${conflictFiles.map((f) => `- ${f}`).join('\n')}
+
+## Instructions
+
+1. Open each conflicting file and resolve the conflict markers
+2. Keep BOTH the task's changes AND the base branch updates where possible
+3. If the base branch changed something the task also changed, prefer the task's intent but make sure it works with the new base branch code
+4. Remove all conflict markers (<<<<<<< HEAD, =======, >>>>>>> ...)
+5. Make sure the code compiles and is consistent after resolution
+6. Do NOT make any changes beyond what is needed to resolve the conflicts`;
+}
+async function resolveConflictsWithAI(task, config, provider, runners, context, branchName) {
+    const check = git.checkConflictsWithBase(config.gitRemote, config.githubBaseBranch);
+    if (check.behindCommits === 0) {
+        logger_1.logger.debug('Branch is up to date with base — no merge needed');
+        return true;
+    }
+    if (check.clean) {
+        logger_1.logger.info(`Branch is ${check.behindCommits} commit(s) behind base — merging (no conflicts)`);
+        if (!git.mergeBaseBranch(config.gitRemote, config.githubBaseBranch)) {
+            logger_1.logger.warn('Clean merge unexpectedly failed — continuing without merge');
+            return true;
+        }
+        if (!git.push(config.gitRemote, branchName)) {
+            logger_1.logger.warn('Failed to push merge commit — continuing anyway');
+        }
+        return true;
+    }
+    logger_1.logger.warn(`Branch has conflicts with ${config.githubBaseBranch} in ${check.conflictFiles.length} file(s): ` +
+        check.conflictFiles.join(', '));
+    try {
+        await provider.postComment(task.id, `[aidev] Branch \`${branchName}\` has merge conflicts with \`${config.githubBaseBranch}\` ` +
+            `in ${check.conflictFiles.length} file(s). Attempting automatic resolution...`);
+    }
+    catch { /* ignore */ }
+    if (!git.mergeBaseBranch(config.gitRemote, config.githubBaseBranch)) {
+        const prompt = buildConflictResolutionPrompt(task, check.conflictFiles, context);
+        let resolved = false;
+        let previousNotes = '';
+        for (const runner of runners) {
+            if (!runner.isAvailable())
+                continue;
+            logger_1.logger.info(`Running ${runner.name} to resolve merge conflicts...`);
+            const result = await runner.run(prompt, previousNotes || undefined);
+            if (result.success && !git.hasChanges()) {
+                logger_1.logger.warn(`${runner.name} made no changes to resolve conflicts — trying next runner`);
+                previousNotes = `Previous runner (${runner.name}) made no file changes. The conflict markers still need to be resolved.`;
+                continue;
+            }
+            if (result.success) {
+                resolved = true;
+                break;
+            }
+            logger_1.logger.warn(`${runner.name} failed to resolve conflicts — trying next runner`);
+            previousNotes = `Previous runner (${runner.name}) failed:\n${result.output}\nErrors:\n${result.error}`;
+        }
+        if (!resolved) {
+            logger_1.logger.error('All AI runners failed to resolve merge conflicts');
+            git.abortMerge();
+            try {
+                await provider.postComment(task.id, '[aidev] Failed to automatically resolve merge conflicts. Manual intervention needed to rebase/merge the branch.');
+            }
+            catch { /* ignore */ }
+            return false;
+        }
+        if (!git.commitMerge(`Merge ${config.githubBaseBranch} into ${branchName} — resolve conflicts`)) {
+            logger_1.logger.error('Failed to commit merge resolution');
+            git.abortMerge();
+            return false;
+        }
+        if (!git.push(config.gitRemote, branchName)) {
+            logger_1.logger.warn('Failed to push conflict resolution — continuing anyway');
+        }
+        logger_1.logger.success('Merge conflicts resolved successfully');
+        try {
+            await provider.postComment(task.id, '[aidev] Merge conflicts resolved automatically.');
+        }
+        catch { /* ignore */ }
+    }
+    return true;
+}
+function fetchPrReviewComments(config, branchName) {
+    if (!(0, github_1.isGitHubRemote)(config.gitRemote) || !(0, github_1.isGhAuthenticated)())
+        return [];
+    if (!config.githubRepo)
+        return [];
+    const prNumber = (0, github_1.getPrNumberForBranch)(branchName);
+    if (!prNumber) {
+        logger_1.logger.debug('No PR found for branch — skipping review comment check');
+        return [];
+    }
+    const parts = config.githubRepo.split('/');
+    if (parts.length !== 2 || !parts[0] || !parts[1])
+        return [];
+    return (0, github_1.fetchUnresolvedReviewThreads)(parts[0], parts[1], prNumber);
+}
+function formatReviewComments(threads) {
+    if (threads.length === 0)
+        return '';
+    let section = '\n\n## Unresolved GitHub Code Review Comments\n\n';
+    section += 'The following code review comments on the pull request must be addressed:\n';
+    for (const thread of threads) {
+        const location = thread.line
+            ? `\`${thread.path}\` (line ${thread.line})`
+            : `\`${thread.path}\``;
+        section += `\n### ${location}\n`;
+        for (const comment of thread.comments) {
+            section += `> **${comment.author}**: ${comment.body}\n`;
+        }
+    }
+    section += '\nPlease fix ALL the issues mentioned in the review comments above.\n';
+    return section;
+}
+function resolveHandledThreads(threads) {
+    let resolved = 0;
+    for (const thread of threads) {
+        if ((0, github_1.resolveReviewThread)(thread.id)) {
+            resolved++;
+        }
+    }
+    if (resolved > 0) {
+        logger_1.logger.info(`Resolved ${resolved}/${threads.length} review thread(s) on GitHub`);
+    }
+}
 async function implementTask(task, branchName, branchExists, config, provider, runners) {
     logger_1.logger.info(`Implementing task: ${task.name}`);
     try {
@@ -324,7 +465,6 @@ async function implementTask(task, branchName, branchExists, config, provider, r
             return;
         }
     }
-    // Get conversation context for pending tasks
     let context = '';
     try {
         const comments = await provider.getComments(task.id);
@@ -335,6 +475,21 @@ async function implementTask(task, branchName, branchExists, config, provider, r
     catch {
         // ignore
     }
+    if (branchExists) {
+        const conflictsOk = await resolveConflictsWithAI(task, config, provider, runners, context, branchName);
+        if (!conflictsOk) {
+            logger_1.logger.error('Cannot proceed — merge conflicts could not be resolved');
+            return;
+        }
+    }
+    // Fetch unresolved PR review comments for existing branches
+    const reviewThreads = branchExists
+        ? fetchPrReviewComments(config, branchName)
+        : [];
+    if (reviewThreads.length > 0) {
+        logger_1.logger.info(`Found ${reviewThreads.length} unresolved review comment(s) to address`);
+        context += formatReviewComments(reviewThreads);
+    }
     const implementPrompt = buildImplementPrompt(task, context);
     // Run AI runners in order with fallback
     let implemented = false;
@@ -377,6 +532,9 @@ async function implementTask(task, branchName, branchExists, config, provider, r
         logger_1.logger.error('Failed to push branch');
         return;
     }
+    if (reviewThreads.length > 0) {
+        resolveHandledThreads(reviewThreads);
+    }
     // Try creating a PR via gh CLI, fall back to compare URL
     try {
         const prUrl = tryCreatePR(config, branchName, task);
@@ -465,7 +623,7 @@ Keep sub-tasks focused: 2-6 sub-tasks is ideal. Order them by dependency (founda
         return null;
     }
 }
-async function executeSubTask(subtask, task, plan, config, runners) {
+async function executeSubTask(subtask, task, plan, config, runners, reviewContext) {
     const instructionsPath = taskInstructionsPath(task.id);
     const instructions = fs.existsSync(instructionsPath)
         ? fs.readFileSync(instructionsPath, 'utf8')
@@ -481,7 +639,7 @@ ${task.description ? `\nTask description:\n${task.description}` : ''}
 
 ## Full implementation instructions
 ${instructions}
-
+${reviewContext || ''}
 ## Progress
 ${completedSteps || '(no steps completed yet)'}
 
@@ -548,6 +706,24 @@ async function implementThinkingTask(task, branchName, branchExists, config, pro
         }
     }
     catch { /* ignore */ }
+    if (branchExists) {
+        const conflictsOk = await resolveConflictsWithAI(task, config, provider, runners, context, branchName);
+        if (!conflictsOk) {
+            logger_1.logger.error('Cannot proceed — merge conflicts could not be resolved');
+            return;
+        }
+    }
+    // Fetch unresolved PR review comments for existing branches
+    const reviewThreads = branchExists
+        ? fetchPrReviewComments(config, branchName)
+        : [];
+    const reviewContext = reviewThreads.length > 0
+        ? formatReviewComments(reviewThreads)
+        : undefined;
+    if (reviewThreads.length > 0) {
+        logger_1.logger.info(`Found ${reviewThreads.length} unresolved review comment(s) to address`);
+        context += reviewContext;
+    }
     // Check for an existing plan (resume scenario)
     let plan = readTaskPlan(task.id);
     if (plan) {
@@ -580,7 +756,7 @@ async function implementThinkingTask(task, branchName, branchExists, config, pro
         subtask.status = 'running';
         writeTaskPlan(plan);
         logger_1.logger.info(`  Starting step ${subtask.id}: ${subtask.title}`);
-        const success = await executeSubTask(subtask, task, plan, config, runners);
+        const success = await executeSubTask(subtask, task, plan, config, runners, reviewContext);
         if (!success) {
             subtask.status = 'failed';
             writeTaskPlan(plan);
@@ -625,6 +801,9 @@ async function implementThinkingTask(task, branchName, branchExists, config, pro
         catch { /* ignore */ }
         return;
     }
+    if (reviewThreads.length > 0) {
+        resolveHandledThreads(reviewThreads);
+    }
     try {
         const prUrl = tryCreatePR(config, branchName, task);
         const comment = buildCompletionComment(branchName, prUrl, config);