takt 0.41.0 → 0.43.0

package/dist/features/tasks/attachments.js

@@ -0,0 +1,129 @@
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { generateReportDir } from '../../shared/utils/index.js';
+function hasAttachments(attachments) {
+    return attachments !== undefined && attachments.length > 0;
+}
+export function buildTaskOrderContent(taskContent, attachments) {
+    if (!hasAttachments(attachments)) {
+        return taskContent;
+    }
+    const attachmentLines = attachments.map((attachment) => `- ${attachment.placeholder}: \`${getTaskAttachmentRelativePath(attachment)}\``);
+    return [
+        taskContent.trimEnd(),
+        '',
+        '## 添付画像',
+        '',
+        ...attachmentLines,
+    ].join('\n');
+}
+function getTaskAttachmentRelativePath(attachment) {
+    return path.posix.join('attachments', attachment.fileName);
+}
+function validateTaskAttachment(attachment) {
+    if (attachment.fileName.includes('/') || attachment.fileName.includes('\\') || attachment.fileName === '') {
+        throw new Error(`Invalid task attachment file name: ${attachment.fileName}`);
+    }
+}
+function validateTaskAttachmentTempFile(attachment) {
+    const stats = fs.lstatSync(attachment.tempPath);
+    if (stats.isSymbolicLink() || !stats.isFile()) {
+        throw new Error(`Task attachment source must be a regular file: ${attachment.tempPath}`);
+    }
+}
+export function promoteTaskAttachments(taskDir, attachments) {
+    if (!hasAttachments(attachments)) {
+        return;
+    }
+    const attachmentsDir = path.join(taskDir, 'attachments');
+    fs.mkdirSync(attachmentsDir, { recursive: true });
+    for (const attachment of attachments) {
+        validateTaskAttachment(attachment);
+        validateTaskAttachmentTempFile(attachment);
+        const destinationPath = path.join(taskDir, getTaskAttachmentRelativePath(attachment));
+        if (fs.existsSync(destinationPath)) {
+            throw new Error(`Task attachment destination already exists: ${destinationPath}`);
+        }
+        fs.copyFileSync(attachment.tempPath, destinationPath);
+    }
+}
+export function resolveUniqueTaskSpecSlug(cwd, taskContent) {
+    const baseSlug = generateReportDir(taskContent);
+    let sequence = 1;
+    let slug = baseSlug;
+    let taskDir = path.join(cwd, '.takt', 'tasks', slug);
+    while (fs.existsSync(taskDir)) {
+        sequence += 1;
+        slug = `${baseSlug}-${sequence}`;
+        taskDir = path.join(cwd, '.takt', 'tasks', slug);
+    }
+    return slug;
+}
+export function cleanupPreparedTaskSpec(taskDir) {
+    fs.rmSync(taskDir, { recursive: true, force: true });
+    const tasksDir = path.dirname(taskDir);
+    if (fs.existsSync(tasksDir) && fs.readdirSync(tasksDir).length === 0) {
+        fs.rmdirSync(tasksDir);
+    }
+}
+function copyAttachmentEntry(sourcePath, destinationPath) {
+    const stats = fs.lstatSync(sourcePath);
+    if (stats.isSymbolicLink()) {
+        throw new Error(`Task attachments must not contain symlinks: ${sourcePath}`);
+    }
+    if (stats.isDirectory()) {
+        fs.mkdirSync(destinationPath, { recursive: true });
+        for (const entry of fs.readdirSync(sourcePath)) {
+            copyAttachmentEntry(path.join(sourcePath, entry), path.join(destinationPath, entry));
+        }
+        return;
+    }
+    if (!stats.isFile()) {
+        throw new Error(`Task attachments must be regular files or directories: ${sourcePath}`);
+    }
+    fs.mkdirSync(path.dirname(destinationPath), { recursive: true });
+    fs.copyFileSync(sourcePath, destinationPath);
+}
+function copyExistingTaskAttachments(sourceTaskDir, taskDir) {
+    const sourceAttachmentsDir = path.join(sourceTaskDir, 'attachments');
+    if (!fs.existsSync(sourceAttachmentsDir)) {
+        return;
+    }
+    const stats = fs.lstatSync(sourceAttachmentsDir);
+    if (stats.isSymbolicLink() || !stats.isDirectory()) {
+        throw new Error(`Task attachments must be a regular directory: ${sourceAttachmentsDir}`);
+    }
+    copyAttachmentEntry(sourceAttachmentsDir, path.join(taskDir, 'attachments'));
+}
+export function prepareTaskSpecDirectory(cwd, taskContent, attachments, options) {
+    const taskDirSlug = resolveUniqueTaskSpecSlug(cwd, taskContent);
+    const taskDir = path.join(cwd, '.takt', 'tasks', taskDirSlug);
+    const taskDirRelative = `.takt/tasks/${taskDirSlug}`;
+    const orderContent = buildTaskOrderContent(taskContent, attachments);
+    const orderPath = path.join(taskDir, 'order.md');
+    fs.mkdirSync(taskDir, { recursive: true });
+    try {
+        if (options?.sourceTaskDir) {
+            copyExistingTaskAttachments(options.sourceTaskDir, taskDir);
+        }
+        promoteTaskAttachments(taskDir, attachments);
+        fs.writeFileSync(orderPath, orderContent, 'utf-8');
+    }
+    catch (error) {
+        cleanupPreparedTaskSpec(taskDir);
+        throw error;
+    }
+    return { taskDir, taskDirRelative };
+}
+export function copyTaskAttachmentsToRunContext(sourceTaskDir, runContextTaskDir) {
+    const sourceAttachmentsDir = path.join(sourceTaskDir, 'attachments');
+    if (!fs.existsSync(sourceAttachmentsDir)) {
+        return;
+    }
+    const stats = fs.lstatSync(sourceAttachmentsDir);
+    if (stats.isSymbolicLink() || !stats.isDirectory()) {
+        throw new Error(`Task attachments must be a regular directory: ${sourceAttachmentsDir}`);
+    }
+    copyAttachmentEntry(sourceAttachmentsDir, path.join(runContextTaskDir, 'attachments'));
+}
+//# sourceMappingURL=attachments.js.map

package/dist/features/tasks/attachments.js.map

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

package/dist/features/tasks/execute/resolveTask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveTask.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/execute/resolveTask.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,QAAQ,EAQd,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,EAAkB,KAAK,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAmBzE,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,mBAAmB,CAAC;IAClC,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,2BAA2B,EAAE,OAAO,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC;AAqDD,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,KAAK,EAAE,GAAG,SAAS,CAmBzG;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,QAAQ,EACd,UAAU,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,qBAAqB,CAAC,CAiIhC"}
+{"version":3,"file":"resolveTask.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/execute/resolveTask.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,QAAQ,EAQd,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,EAAkB,KAAK,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAoBzE,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,mBAAmB,CAAC;IAClC,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,2BAA2B,EAAE,OAAO,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC;AAqDD,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,KAAK,EAAE,GAAG,SAAS,CAmBzG;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,QAAQ,EACd,UAAU,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,qBAAqB,CAAC,CAiIhC"}

package/dist/features/tasks/execute/resolveTask.js

@@ -5,6 +5,7 @@ import { getGitProvider } from '../../../infra/git/index.js';
 import { withProgress } from '../../../shared/ui/index.js';
 import { createLogger, getErrorMessage } from '../../../shared/utils/index.js';
 import { generateReportDir } from '../../../shared/utils/reportDir.js';
+import { generateExecutionReportDir } from '../../../core/workflow/run/run-slug.js';
 import { getTaskSlugFromTaskDir } from '../../../shared/utils/taskPaths.js';
 import { stageTaskSpecForExecution } from './taskSpecContext.js';
 import { resolveReusedWorktreeExecution } from './reusedWorktree.js';
@@ -97,7 +98,6 @@ export async function resolveTaskExecution(task, defaultCwd, abortSignal) {
         if (!taskSlug) {
             throw new Error(`Invalid task_dir format: ${task.taskDir}`);
         }
-        reportDirName = taskSlug;
     }
     if (data.worktree) {
         throwIfAborted(abortSignal);
@@ -130,12 +130,13 @@ export async function resolveTaskExecution(task, defaultCwd, abortSignal) {
             isWorktree = true;
         }
     }
-    if (task.taskDir && reportDirName) {
+    if (task.taskDir) {
+        reportDirName = generateExecutionReportDir(execCwd, task.content);
         const stagedTaskSpec = stageTaskSpecForExecution(defaultCwd, execCwd, task.taskDir, reportDirName);
         taskPrompt = stagedTaskSpec.taskPrompt;
         orderContent = stagedTaskSpec.orderContent;
     }
-    const resolvedReportDirName = reportDirName ?? generateReportDir(taskPrompt ?? task.content);
+    const resolvedReportDirName = reportDirName ?? generateReportDir(task.content);
     const retryResume = resolveRetryResume(workflowIdentifier, defaultCwd, execCwd, configuredStartStep, resumePoint);
     const resolvedRetryNote = data.retry_note;
     const maxStepsOverride = data.exceeded_max_steps;

package/dist/features/tasks/execute/resolveTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveTask.js","sourceRoot":"","sources":["../../../../src/features/tasks/execute/resolveTask.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolveTask.js","sourceRoot":"","sources":["../../../../src/features/tasks/execute/resolveTask.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,yBAAyB,EACzB,0BAA0B,GAC3B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAEL,0BAA0B,EAC1B,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,wBAAwB,EACxB,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,+BAA+B,EAAE,MAAM,4CAA4C,CAAC;AAC7F,OAAO,EAAE,cAAc,EAAc,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,0BAA0B,EAAE,MAAM,wCAAwC,CAAC;AACpF,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AAErE,MAAM,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;AAEjC,SAAS,yBAAyB,CAAC,QAA0B;IAC3D,OAAO,QAAQ,EAAE,WAAW,CAAC;AAC/B,CAAC;AAED,SAAS,qBAAqB,CAAC,UAAkB,EAAE,QAA0B;IAC3E,MAAM,mBAAmB,GAAG,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAChE,OAAO,iBAAiB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC,MAAM,CAAC;AACnE,CAAC;AAwBD,SAAS,kBAAkB,CACzB,kBAA0B,EAC1B,UAAkB,EAClB,SAAiB,EACjB,mBAAuC,EACvC,WAA4C;IAK5C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,mBAAmB,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACvE,CAAC;IAED,MAAM,cAAc,GAAG,wBAAwB,CAAC,kBAAkB,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IAC/F,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO;YACL,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACnE,CAAC;IACJ,CAAC;IAED,MAAM,mBAAmB,GAAG,+BAA+B,CAAC;QAC1D,QAAQ,EAAE,cAAc;QACxB,WAAW;QACX,mBAAmB,EAAE,CAAC,cAAc,EAAE,IAAI,EAAE,EAAE,CAAC,yBAAyB,CACtE,cAAc,EACd,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,IAAI,EACT,UAAU,EACV,SAAS,CACV;KACF,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,mBAAmB,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAChD,IAAI,SAAS,EAAE,CAAC;QACd,OAAO;YACL,SAAS,EAAE,SAAS,CAAC,IAAI;YACzB,WAAW,EAAE,mBAAmB;SACjC,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACnE,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,MAAoB;IAC1C,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,WAA+B,EAAE,UAAkB;IAClF,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,SAAS,GAAG,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IACzD,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;QACzB,GAAG,CAAC,IAAI,CAAC,4DAA4D,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;QACxF,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,WAAW,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAC9D,OAAO,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,IAAI,CAAC,kEAAkE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACzH,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,IAAc,EACd,UAAkB,EAClB,WAAyB;IAEzB,cAAc,CAAC,WAAW,CAAC,CAAC;IAE5B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACvB,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,SAAS,IAAI,CAAC,IAAI,iDAAiD,CAAC,CAAC;IACvF,CAAC;IAED,MAAM,cAAc,GAAG,EAAE,GAAG,IAAI,EAA6B,CAAC;IAC9D,OAAO,cAAc,CAAC,IAAI,CAAC;IAC3B,OAAO,cAAc,CAAC,UAAU,CAAC;IACjC,MAAM,cAAc,GAAG,yBAAyB,CAAC,KAAK,CAAC,cAAc,CAA4B,CAAC;IAClG,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,cAAc,CAAC,CAAC;IACpE,IAAI,CAAC,kBAAkB,IAAI,kBAAkB,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC5D,MAAM,IAAI,KAAK,CAAC,SAAS,IAAI,CAAC,IAAI,iCAAiC,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,mBAAmB,GAAG,yBAAyB,CAAC,cAAc,CAAC,CAAC;IACtE,MAAM,WAAW,GAAG,cAAc,CAAC,YAA+C,CAAC;IACnF,MAAM,SAAS,GAAG,cAAc,CAAC,UAAU,CAAC;IAE5C,IAAI,OAAO,GAAG,UAAU,CAAC;IACzB,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,IAAI,aAAiC,CAAC;IACtC,IAAI,UAA8B,CAAC;IACnC,IAAI,YAAgC,CAAC;IACrC,IAAI,MAA0B,CAAC;IAC/B,IAAI,YAAgC,CAAC;IACrC,IAAI,UAA8B,CAAC;IACnC,MAAM,mBAAmB,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;IAC5D,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,QAAQ,GAAG,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAED,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,cAAc,CAAC,WAAW,CAAC,CAAC;QAC5B,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC;QACjC,MAAM,eAAe,GAAG,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QACjF,UAAU,GAAG,eAAe;YAC1B,CAAC,CAAC,qBAAqB,CAAC,UAAU,EAAE,IAAI,CAAC;YACzC,CAAC,CAAC,mBAAmB,CAAC;QAExB,MAAM,cAAc,GAAG,8BAA8B,CACnD,UAAU,EACV,IAAI,EACJ,mBAAmB,EACnB,WAAW,EACX,SAAS,CACV,CAAC;QACF,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC;YACjC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;YAC/B,YAAY,GAAG,cAAc,CAAC,YAAY,CAAC;YAC3C,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC;QACzC,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,IAAI,MAAM,YAAY,CAC9C,2BAA2B,EAC3B,CAAC,IAAI,EAAE,EAAE,CAAC,0BAA0B,IAAI,EAAE,EAC1C,GAAG,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAC3D,CAAC;YAEF,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,MAAM,GAAG,MAAM,YAAY,CAC/B,mBAAmB,EACnB,CAAC,WAAW,EAAE,EAAE,CAAC,kBAAkB,WAAW,CAAC,IAAI,aAAa,WAAW,CAAC,MAAM,GAAG,EACrF,KAAK,IAAI,EAAE,CAAC,0BAA0B,CAAC,UAAU,EAAE;gBACjD,QAAQ,EAAE,IAAI,CAAC,QAAS;gBACxB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnE,QAAQ;gBACR,WAAW,EAAE,IAAI,CAAC,KAAK;aACxB,EAAE,WAAW,CAAC,CAChB,CAAC;YACF,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC;YACtB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;YACvB,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC;YAC3B,UAAU,GAAG,IAAI,CAAC;QACpB,CAAC;IACH,CAAC;IAED,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,aAAa,GAAG,0BAA0B,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAClE,MAAM,cAAc,GAAG,yBAAyB,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QACnG,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC;QACvC,YAAY,GAAG,cAAc,CAAC,YAAY,CAAC;IAC7C,CAAC;IAED,MAAM,qBAAqB,GAAG,aAAa,IAAI,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/E,MAAM,WAAW,GAAG,kBAAkB,CACpC,kBAAkB,EAClB,UAAU,EACV,OAAO,EACP,mBAAmB,EACnB,WAAW,CACZ,CAAC;IACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC;IAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC,kBAAkB,CAAC;IACjD,MAAM,wBAAwB,GAAG,IAAI,CAAC,0BAA0B,IAAI,WAAW,CAAC,WAAW,EAAE,SAAS,CAAC;IAEvG,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,IAAI,0BAA0B,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,KAAK,CAAC;IACzF,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,IAAI,0BAA0B,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,KAAK,CAAC;IAC5F,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC;IAC3C,MAAM,2BAA2B,GAC/B,cAAc,CAAC,+BAA+B,KAAK,IAAI,IAAI,MAAM,CAAC;IAEpE,OAAO;QACL,OAAO;QACP,kBAAkB;QAClB,UAAU;QACV,aAAa,EAAE,qBAAqB;QACpC,MAAM;QACN,OAAO;QACP,SAAS;QACT,2BAA2B;QAC3B,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrC,GAAG,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvD,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrC,GAAG,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtE,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,GAAG,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5E,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,GAAG,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,GAAG,CAAC,wBAAwB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,wBAAwB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAChF,CAAC;AACJ,CAAC"}

package/dist/features/tasks/execute/runMeta.d.ts

@@ -6,11 +6,15 @@
  */
 import type { RunPaths } from '../../../core/workflow/run/run-paths.js';
 import type { WorkflowResumePoint } from '../../../core/models/index.js';
+export interface DirectResumeMetadata {
+    readonly sourceRunSlug: string;
+    readonly resumeMode: 'requeue' | 'retry' | 'instruct';
+}
 export declare class RunMetaManager {
     private readonly runMeta;
     private readonly metaAbs;
     private finalized;
-    constructor(runPaths: RunPaths, task: string, workflowName: string);
+    constructor(runPaths: RunPaths, task: string, workflowName: string, directResume?: DirectResumeMetadata);
     updateStep(stepName: string, iteration: number, resumePoint?: WorkflowResumePoint): void;
     updatePhase(stepName: string, iteration: number, phase: 1 | 2 | 3): void;
     updateResumePoint(resumePoint?: WorkflowResumePoint): void;

package/dist/features/tasks/execute/runMeta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runMeta.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/execute/runMeta.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAMzE,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,SAAS,CAAS;gBAEd,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAiBlE,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,mBAAmB,GAAG,IAAI;IAQxF,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI;IAOxE,iBAAiB,CAAC,WAAW,CAAC,EAAE,mBAAmB,GAAG,IAAI;IAK1D,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;IAUpE,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,OAAO,CAAC,YAAY;CAWrB"}
+{"version":3,"file":"runMeta.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/execute/runMeta.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,GAAG,UAAU,CAAC;CACvD;AAQD,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,SAAS,CAAS;gBAGxB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,oBAAoB;IAsBrC,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,mBAAmB,GAAG,IAAI;IAQxF,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI;IAOxE,iBAAiB,CAAC,WAAW,CAAC,EAAE,mBAAmB,GAAG,IAAI;IAK1D,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;IAUpE,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,OAAO,CAAC,YAAY;CAarB"}

package/dist/features/tasks/execute/runMeta.js

@@ -9,7 +9,7 @@ export class RunMetaManager {
     runMeta;
     metaAbs;
     finalized = false;
-    constructor(runPaths, task, workflowName) {
+    constructor(runPaths, task, workflowName, directResume) {
         this.metaAbs = runPaths.metaAbs;
         this.runMeta = {
             task,
@@ -21,6 +21,10 @@ export class RunMetaManager {
             logsDirectory: runPaths.logsRel,
             status: 'running',
             startTime: new Date().toISOString(),
+            ...(directResume ? {
+                sourceRunSlug: directResume.sourceRunSlug,
+                resumeMode: directResume.resumeMode,
+            } : {}),
         };
         ensureDir(runPaths.runRootAbs);
         this.writeRunMeta(this.runMeta);
@@ -56,12 +60,14 @@ export class RunMetaManager {
     }
     writeRunMeta(meta) {
         const updatedAt = new Date().toISOString();
+        const { resumePoint, sourceRunSlug, resumeMode, ...baseMeta } = meta;
         const serialized = {
-            ...meta,
+            ...baseMeta,
             updatedAt,
-            ...(meta.resumePoint ? { resume_point: meta.resumePoint } : {}),
+            ...(resumePoint ? { resume_point: resumePoint } : {}),
+            ...(sourceRunSlug ? { source_run_slug: sourceRunSlug } : {}),
+            ...(resumeMode ? { resume_mode: resumeMode } : {}),
         };
-        delete serialized.resumePoint;
         this.runMeta.updatedAt = updatedAt;
         writeFileAtomic(this.metaAbs, JSON.stringify(serialized, null, 2));
     }

package/dist/features/tasks/execute/runMeta.js.map

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

package/dist/features/tasks/execute/selectAndExecute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selectAndExecute.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/execute/selectAndExecute.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAI5G,YAAY,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,CAAC;AAIpE,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAa9F;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,sBAAsB,CAAC,EAAE,OAAO,GAAG,SAAS,EAC5C,cAAc,CAAC,EAAE,MAAM,EACvB,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,0BAA0B,CAAC,CA8BrC;AAED,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,uBAAuB,EACjC,cAAc,CAAC,EAAE,oBAAoB,GACpC,OAAO,CAAC,IAAI,CAAC,CA4Df"}
+{"version":3,"file":"selectAndExecute.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/execute/selectAndExecute.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAM5G,YAAY,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,CAAC;AAmBpE,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAa9F;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,sBAAsB,CAAC,EAAE,OAAO,GAAG,SAAS,EAC5C,cAAc,CAAC,EAAE,MAAM,EACvB,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,0BAA0B,CAAC,CA8BrC;AAED,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,uBAAuB,EACjC,cAAc,CAAC,EAAE,oBAAoB,GACpC,OAAO,CAAC,IAAI,CAAC,CAuFf"}

package/dist/features/tasks/execute/selectAndExecute.js

@@ -4,11 +4,26 @@ import { createSharedClone, summarizeTaskName, resolveBaseBranch, TaskRunner } f
 import { info, error, warn, withProgress } from '../../../shared/ui/index.js';
 import { statusLine } from '../../../shared/ui/StatusLine.js';
 import { createLogger } from '../../../shared/utils/index.js';
+import { generateExecutionReportDir } from '../../../core/workflow/run/run-slug.js';
 import { sanitizeTerminalText } from '../../../shared/utils/text.js';
 import { executeTask } from './taskExecution.js';
 import { selectWorkflow } from '../../workflowSelection/index.js';
 import { buildBooleanTaskResult, persistTaskError, persistTaskResult } from './taskResultHandler.js';
+import { prepareTaskSpecDirectory, cleanupPreparedTaskSpec } from '../attachments.js';
+import { cleanupStagedTaskSpec, stageTaskSpecForExecution } from './taskSpecContext.js';
 const log = createLogger('selectAndExecute');
+function cleanupTransientTaskSpecs(preparedSpecTaskDir, stagedSpec) {
+    try {
+        if (stagedSpec) {
+            cleanupStagedTaskSpec(stagedSpec);
+        }
+    }
+    finally {
+        if (preparedSpecTaskDir) {
+            cleanupPreparedTaskSpec(preparedSpecTaskDir);
+        }
+    }
+}
 export async function determineWorkflow(cwd, override) {
     if (override) {
         if (isWorkflowPath(override)) {
@@ -50,23 +65,51 @@ export async function selectAndExecuteTask(cwd, task, options, agentOverrides) {
     log.info('Starting task execution', { workflow: workflowIdentifier, worktree: false });
     const taskRunner = new TaskRunner(cwd, { onWarning: warn });
     let taskRecord = null;
+    let preparedSpec;
+    let stagedSpec;
+    let reportDirName;
+    try {
+        preparedSpec = options?.attachments && options.attachments.length > 0
+            ? prepareTaskSpecDirectory(cwd, task, options.attachments)
+            : undefined;
+        if (preparedSpec) {
+            reportDirName = generateExecutionReportDir(execCwd, task);
+            stagedSpec = stageTaskSpecForExecution(cwd, execCwd, preparedSpec.taskDirRelative, reportDirName);
+        }
+    }
+    catch (error) {
+        if (preparedSpec) {
+            cleanupPreparedTaskSpec(preparedSpec.taskDir);
+        }
+        throw error;
+    }
     if (options?.skipTaskList !== true) {
-        taskRecord = taskRunner.addTask(task, {
-            workflow: workflowIdentifier,
-        });
+        try {
+            taskRecord = taskRunner.addTask(task, {
+                workflow: workflowIdentifier,
+                ...(preparedSpec ? { task_dir: preparedSpec.taskDirRelative } : {}),
+            });
+        }
+        catch (error) {
+            cleanupTransientTaskSpecs(preparedSpec?.taskDir, stagedSpec);
+            throw error;
+        }
     }
+    const preparedSpecTaskDirToCleanup = options?.skipTaskList === true ? preparedSpec?.taskDir : undefined;
+    const stagedSpecToCleanup = options?.skipTaskList === true ? stagedSpec : undefined;
     const startedAt = new Date().toISOString();
     statusLine.start('Running...');
     let taskSuccess;
     try {
         taskSuccess = await executeTask({
-            task,
+            task: stagedSpec?.taskPrompt ?? task,
             cwd: execCwd,
             workflowIdentifier,
             projectCwd: cwd,
             agentOverrides,
             interactiveUserInput: options?.interactiveUserInput === true,
             interactiveMetadata: options?.interactiveMetadata,
+            ...(reportDirName ? { reportDirName } : {}),
         });
     }
     catch (err) {
@@ -80,6 +123,7 @@ export async function selectAndExecuteTask(cwd, task, options, agentOverrides) {
     }
     finally {
         statusLine.stop();
+        cleanupTransientTaskSpecs(preparedSpecTaskDirToCleanup, stagedSpecToCleanup);
     }
     const completedAt = new Date().toISOString();
     if (taskRecord) {

package/dist/features/tasks/execute/selectAndExecute.js.map

@@ -1 +1 @@
-{"version":3,"file":"selectAndExecute.js","sourceRoot":"","sources":["../../../../src/features/tasks/execute/selectAndExecute.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,cAAc,GACf,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AACnH,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAIrG,MAAM,GAAG,GAAG,YAAY,CAAC,kBAAkB,CAAC,CAAC;AAE7C,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,GAAW,EAAE,QAAiB;IACpE,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACjE,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,KAAK,CAAC,uBAAuB,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC/D,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,GAAW,EACX,IAAY,EACZ,sBAA4C,EAC5C,cAAuB,EACvB,kBAA2B;IAE3B,MAAM,WAAW,GACf,OAAO,sBAAsB,KAAK,SAAS;QACzC,CAAC,CAAC,sBAAsB;QACxB,CAAC,CAAC,MAAM,OAAO,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;IAE9C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAC7C,CAAC;IAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC,MAAM,CAAC;IAErE,MAAM,QAAQ,GAAG,MAAM,YAAY,CACjC,2BAA2B,EAC3B,CAAC,IAAI,EAAE,EAAE,CAAC,0BAA0B,IAAI,EAAE,EAC1C,GAAG,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CACvC,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,YAAY,CAC/B,mBAAmB,EACnB,CAAC,WAAW,EAAE,EAAE,CAAC,kBAAkB,WAAW,CAAC,IAAI,aAAa,WAAW,CAAC,MAAM,GAAG,EACjF,KAAK,IAAI,EAAE,CAAC,iBAAiB,CAAC,GAAG,EAAE;QACjC,QAAQ,EAAE,IAAI;QACd,QAAQ;QACR,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACtD,CAAC,CACH,CAAC;IAEN,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;AACjG,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,GAAW,EACX,IAAY,EACZ,OAAiC,EACjC,cAAqC;IAErC,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAE3E,IAAI,kBAAkB,KAAK,IAAI,EAAE,CAAC;QAChC,IAAI,CAAC,WAAW,CAAC,CAAC;QAClB,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,GAAG,CAAC;IACpB,GAAG,CAAC,IAAI,CAAC,yBAAyB,EAAE,EAAE,QAAQ,EAAE,kBAAkB,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IACvF,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5D,IAAI,UAAU,GAAsD,IAAI,CAAC;IACzE,IAAI,OAAO,EAAE,YAAY,KAAK,IAAI,EAAE,CAAC;QACnC,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE;YACpC,QAAQ,EAAE,kBAAkB;SAC7B,CAAC,CAAC;IACL,CAAC;IACD,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAE3C,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC/B,IAAI,WAAoB,CAAC;IACzB,IAAI,CAAC;QACH,WAAW,GAAG,MAAM,WAAW,CAAC;YAC9B,IAAI;YACJ,GAAG,EAAE,OAAO;YACZ,kBAAkB;YAClB,UAAU,EAAE,GAAG;YACf,cAAc;YACd,oBAAoB,EAAE,OAAO,EAAE,oBAAoB,KAAK,IAAI;YAC5D,mBAAmB,EAAE,OAAO,EAAE,mBAAmB;SAClD,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC7C,IAAI,UAAU,EAAE,CAAC;YACf,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,EAAE;gBACpE,cAAc,EAAE,eAAe;aAChC,CAAC,CAAC;QACL,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;YAAS,CAAC;QACT,UAAU,CAAC,IAAI,EAAE,CAAC;IACpB,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAE7C,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,UAAU,GAAG,sBAAsB,CAAC;YACxC,IAAI,EAAE,UAAU;YAChB,WAAW;YACX,eAAe,EAAE,6BAA6B;YAC9C,eAAe,EAAE,aAAa;YAC9B,SAAS;YACT,WAAW;SACZ,CAAC,CAAC;QACH,iBAAiB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC"}
+{"version":3,"file":"selectAndExecute.js","sourceRoot":"","sources":["../../../../src/features/tasks/execute/selectAndExecute.ts"],"names":[],"mappings":"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"}

package/dist/features/tasks/execute/taskSpecContext.d.ts

@@ -1,5 +1,10 @@
-export declare function stageTaskSpecForExecution(projectCwd: string, execCwd: string, taskDir: string, reportDirName: string): {
+export interface StagedTaskSpec {
     taskPrompt: string;
     orderContent: string;
-};
+    contextTaskDir: string;
+    contextDir: string;
+    runRootDir: string;
+}
+export declare function stageTaskSpecForExecution(projectCwd: string, execCwd: string, taskDir: string, reportDirName: string): StagedTaskSpec;
+export declare function cleanupStagedTaskSpec(stagedSpec: StagedTaskSpec): void;
 //# sourceMappingURL=taskSpecContext.d.ts.map

package/dist/features/tasks/execute/taskSpecContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"taskSpecContext.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/execute/taskSpecContext.ts"],"names":[],"mappings":"AAgDA,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GACpB;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAY9C"}
+{"version":3,"file":"taskSpecContext.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/execute/taskSpecContext.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAYD,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GACpB,cAAc,CAsBhB;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,cAAc,GAAG,IAAI,CAItE"}

package/dist/features/tasks/execute/taskSpecContext.js

@@ -2,54 +2,41 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { buildRunPaths } from '../../../core/workflow/run/run-paths.js';
 import { buildTaskInstruction } from '../../../infra/task/index.js';
+import { copyTaskAttachmentsToRunContext } from '../attachments.js';
+import { readTaskSpecFile } from '../taskSpecFile.js';
 function getTaskSpecPath(projectCwd, taskDir) {
     return path.join(projectCwd, taskDir, 'order.md');
 }
-function buildMissingTaskSpecError(sourceOrderPath) {
-    return new Error(`Task spec file is missing: ${sourceOrderPath}`);
-}
-function buildInvalidTaskSpecError(sourceOrderPath) {
-    return new Error(`Task spec file must be a regular file: ${sourceOrderPath}`);
+function removeEmptyDirectory(directory) {
+    if (fs.existsSync(directory) && fs.readdirSync(directory).length === 0) {
+        fs.rmdirSync(directory);
+    }
 }
-function readTaskSpecForStaging(sourceOrderPath) {
-    let fileDescriptor;
+export function stageTaskSpecForExecution(projectCwd, execCwd, taskDir, reportDirName) {
+    const sourceTaskDir = path.join(projectCwd, taskDir);
+    const sourceOrderPath = getTaskSpecPath(projectCwd, taskDir);
+    const orderContent = readTaskSpecFile(sourceOrderPath);
+    const runPaths = buildRunPaths(execCwd, reportDirName);
     try {
-        const sourceStats = fs.lstatSync(sourceOrderPath);
-        if (!sourceStats.isFile()) {
-            throw buildInvalidTaskSpecError(sourceOrderPath);
-        }
-        fileDescriptor = fs.openSync(sourceOrderPath, fs.constants.O_RDONLY | fs.constants.O_NOFOLLOW);
-        const descriptorStats = fs.fstatSync(fileDescriptor);
-        if (!descriptorStats.isFile()) {
-            throw buildInvalidTaskSpecError(sourceOrderPath);
-        }
-        return fs.readFileSync(fileDescriptor, 'utf-8');
+        fs.mkdirSync(runPaths.contextTaskAbs, { recursive: true });
+        fs.writeFileSync(runPaths.contextTaskOrderAbs, orderContent, 'utf-8');
+        copyTaskAttachmentsToRunContext(sourceTaskDir, runPaths.contextTaskAbs);
     }
     catch (error) {
-        const errorCode = error.code;
-        if (errorCode === 'ENOENT') {
-            throw buildMissingTaskSpecError(sourceOrderPath);
-        }
-        if (errorCode === 'ELOOP') {
-            throw buildInvalidTaskSpecError(sourceOrderPath);
-        }
+        fs.rmSync(runPaths.contextTaskAbs, { recursive: true, force: true });
         throw error;
     }
-    finally {
-        if (fileDescriptor !== undefined) {
-            fs.closeSync(fileDescriptor);
-        }
-    }
-}
-export function stageTaskSpecForExecution(projectCwd, execCwd, taskDir, reportDirName) {
-    const sourceOrderPath = getTaskSpecPath(projectCwd, taskDir);
-    const orderContent = readTaskSpecForStaging(sourceOrderPath);
-    const runPaths = buildRunPaths(execCwd, reportDirName);
-    fs.mkdirSync(runPaths.contextTaskAbs, { recursive: true });
-    fs.writeFileSync(runPaths.contextTaskOrderAbs, orderContent, 'utf-8');
     return {
         taskPrompt: buildTaskInstruction(runPaths.contextTaskRel, runPaths.contextTaskOrderRel),
         orderContent,
+        contextTaskDir: runPaths.contextTaskAbs,
+        contextDir: runPaths.contextAbs,
+        runRootDir: runPaths.runRootAbs,
     };
 }
+export function cleanupStagedTaskSpec(stagedSpec) {
+    fs.rmSync(stagedSpec.contextTaskDir, { recursive: true, force: true });
+    removeEmptyDirectory(stagedSpec.contextDir);
+    removeEmptyDirectory(stagedSpec.runRootDir);
+}
 //# sourceMappingURL=taskSpecContext.js.map

package/dist/features/tasks/execute/taskSpecContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"taskSpecContext.js","sourceRoot":"","sources":["../../../../src/features/tasks/execute/taskSpecContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,SAAS,eAAe,CAAC,UAAkB,EAAE,OAAe;IAC1D,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,yBAAyB,CAAC,eAAuB;IACxD,OAAO,IAAI,KAAK,CAAC,8BAA8B,eAAe,EAAE,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,yBAAyB,CAAC,eAAuB;IACxD,OAAO,IAAI,KAAK,CAAC,0CAA0C,eAAe,EAAE,CAAC,CAAC;AAChF,CAAC;AAED,SAAS,sBAAsB,CAAC,eAAuB;IACrD,IAAI,cAAkC,CAAC;IACvC,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAClD,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;YAC1B,MAAM,yBAAyB,CAAC,eAAe,CAAC,CAAC;QACnD,CAAC;QAED,cAAc,GAAG,EAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,GAAG,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAC/F,MAAM,eAAe,GAAG,EAAE,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QACrD,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC;YAC9B,MAAM,yBAAyB,CAAC,eAAe,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,EAAE,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,SAAS,GAAI,KAA+B,CAAC,IAAI,CAAC;QACxD,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC3B,MAAM,yBAAyB,CAAC,eAAe,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;YAC1B,MAAM,yBAAyB,CAAC,eAAe,CAAC,CAAC;QACnD,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;YAAS,CAAC;QACT,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YACjC,EAAE,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,UAAkB,EAClB,OAAe,EACf,OAAe,EACf,aAAqB;IAErB,MAAM,eAAe,GAAG,eAAe,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC7D,MAAM,YAAY,GAAG,sBAAsB,CAAC,eAAe,CAAC,CAAC;IAC7D,MAAM,QAAQ,GAAG,aAAa,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAEvD,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,mBAAmB,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IAEtE,OAAO;QACL,UAAU,EAAE,oBAAoB,CAAC,QAAQ,CAAC,cAAc,EAAE,QAAQ,CAAC,mBAAmB,CAAC;QACvF,YAAY;KACb,CAAC;AACJ,CAAC"}
+{"version":3,"file":"taskSpecContext.js","sourceRoot":"","sources":["../../../../src/features/tasks/execute/taskSpecContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,+BAA+B,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAUtD,SAAS,eAAe,CAAC,UAAkB,EAAE,OAAe;IAC1D,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,oBAAoB,CAAC,SAAiB;IAC7C,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvE,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,UAAkB,EAClB,OAAe,EACf,OAAe,EACf,aAAqB;IAErB,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACrD,MAAM,eAAe,GAAG,eAAe,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC7D,MAAM,YAAY,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAG,aAAa,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAEvD,IAAI,CAAC;QACH,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,mBAAmB,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QACtE,+BAA+B,CAAC,aAAa,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;IAC1E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACrE,MAAM,KAAK,CAAC;IACd,CAAC;IAED,OAAO;QACL,UAAU,EAAE,oBAAoB,CAAC,QAAQ,CAAC,cAAc,EAAE,QAAQ,CAAC,mBAAmB,CAAC;QACvF,YAAY;QACZ,cAAc,EAAE,QAAQ,CAAC,cAAc;QACvC,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,UAAU,EAAE,QAAQ,CAAC,UAAU;KAChC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,UAA0B;IAC9D,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACvE,oBAAoB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAC5C,oBAAoB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AAC9C,CAAC"}

package/dist/features/tasks/execute/taskWorkflowExecution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"taskWorkflowExecution.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/execute/taskWorkflowExecution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAMpE,OAAO,KAAK,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAIxG,KAAK,gBAAgB,GAAG,CACtB,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,wBAAwB,KAC9B,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAEtC,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,kBAAkB,EAC3B,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,uBAAuB,CAAC,CAmElC"}
+{"version":3,"file":"taskWorkflowExecution.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/execute/taskWorkflowExecution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAMpE,OAAO,KAAK,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAIxG,KAAK,gBAAgB,GAAG,CACtB,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,wBAAwB,KAC9B,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAEtC,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,kBAAkB,EAC3B,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,uBAAuB,CAAC,CAqElC"}

package/dist/features/tasks/execute/taskWorkflowExecution.js

@@ -5,7 +5,7 @@ import { createLogger } from '../../../shared/utils/index.js';
 import { sanitizeTerminalText } from '../../../shared/utils/text.js';
 const log = createLogger('task');
 export async function executeTaskWorkflow(options, workflowExecutor) {
-    const { task, cwd, workflowIdentifier, projectCwd, agentOverrides, interactiveUserInput, interactiveMetadata, startStep, retryNote, resumePoint, reportDirName, abortSignal, taskPrefix, taskColorIndex, taskDisplayLabel, maxStepsOverride, initialIterationOverride, currentTaskIssueNumber, } = options;
+    const { task, cwd, workflowIdentifier, projectCwd, agentOverrides, interactiveUserInput, interactiveMetadata, startStep, retryNote, resumePoint, directResume, reportDirName, abortSignal, taskPrefix, taskColorIndex, taskDisplayLabel, maxStepsOverride, initialIterationOverride, currentTaskIssueNumber, } = options;
     const workflowConfig = loadWorkflowByIdentifier(workflowIdentifier, projectCwd, { lookupCwd: cwd });
     const safeWorkflowIdentifier = sanitizeTerminalText(workflowIdentifier);
     if (!workflowConfig) {
@@ -40,6 +40,7 @@ export async function executeTaskWorkflow(options, workflowExecutor) {
         startStep,
         retryNote,
         resumePoint,
+        directResume,
         reportDirName,
         abortSignal,
         taskPrefix,

package/dist/features/tasks/execute/taskWorkflowExecution.js.map

@@ -1 +1 @@
-{"version":3,"file":"taskWorkflowExecution.js","sourceRoot":"","sources":["../../../../src/features/tasks/execute/taskWorkflowExecution.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,cAAc,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AACvH,OAAO,EAAE,+BAA+B,EAAE,MAAM,6CAA6C,CAAC;AAC9F,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAGrE,MAAM,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;AASjC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAA2B,EAC3B,gBAAkC;IAElC,MAAM,EACJ,IAAI,EACJ,GAAG,EACH,kBAAkB,EAClB,UAAU,EACV,cAAc,EACd,oBAAoB,EACpB,mBAAmB,EACnB,SAAS,EACT,SAAS,EACT,WAAW,EACX,aAAa,EACb,WAAW,EACX,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,wBAAwB,EACxB,sBAAsB,GACvB,GAAG,OAAO,CAAC;IACZ,MAAM,cAAc,GAAG,wBAAwB,CAAC,kBAAkB,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;IACpG,MAAM,sBAAsB,GAAG,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;IAExE,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,IAAI,cAAc,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACvC,KAAK,CAAC,4BAA4B,sBAAsB,EAAE,CAAC,CAAC;YAC5D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,4BAA4B,sBAAsB,EAAE,EAAE,CAAC;QAC1F,CAAC;QAED,KAAK,CAAC,aAAa,sBAAsB,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,8EAA8E,CAAC,CAAC;QACrF,IAAI,CAAC,gHAAgH,CAAC,CAAC;QACvH,IAAI,CAAC,sEAAsE,CAAC,CAAC;QAC7E,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,sBAAsB,cAAc,EAAE,CAAC;IACvF,CAAC;IACD,GAAG,CAAC,KAAK,CAAC,kBAAkB,EAAE;QAC5B,IAAI,EAAE,cAAc,CAAC,IAAI;QACzB,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;KACjE,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,2BAA2B,CAAC,UAAU,EAAE,CAAC,UAAU,EAAE,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAC7G,MAAM,eAAe,GAAG,+BAA+B,CAAC,UAAU,CAAC,CAAC;IACpE,OAAO,gBAAgB,CAAC,cAAc,EAAE,IAAI,EAAE,GAAG,EAAE;QACjD,UAAU;QACV,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,QAAQ,EAAE,cAAc,EAAE,QAAQ;QAClC,KAAK,EAAE,cAAc,EAAE,KAAK;QAC5B,eAAe,EAAE,eAAe,CAAC,KAAK;QACtC,qBAAqB,EAAE,eAAe,CAAC,MAAM;QAC7C,6BAA6B,EAAE,eAAe,CAAC,cAAc;QAC7D,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,oBAAoB;QACpB,mBAAmB;QACnB,SAAS;QACT,SAAS;QACT,WAAW;QACX,aAAa;QACb,WAAW;QACX,UAAU;QACV,cAAc;QACd,gBAAgB;QAChB,gBAAgB;QAChB,wBAAwB;QACxB,sBAAsB;KACvB,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"taskWorkflowExecution.js","sourceRoot":"","sources":["../../../../src/features/tasks/execute/taskWorkflowExecution.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,cAAc,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AACvH,OAAO,EAAE,+BAA+B,EAAE,MAAM,6CAA6C,CAAC;AAC9F,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAGrE,MAAM,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;AASjC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAA2B,EAC3B,gBAAkC;IAElC,MAAM,EACJ,IAAI,EACJ,GAAG,EACH,kBAAkB,EAClB,UAAU,EACV,cAAc,EACd,oBAAoB,EACpB,mBAAmB,EACnB,SAAS,EACT,SAAS,EACT,WAAW,EACX,YAAY,EACZ,aAAa,EACb,WAAW,EACX,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,wBAAwB,EACxB,sBAAsB,GACvB,GAAG,OAAO,CAAC;IACZ,MAAM,cAAc,GAAG,wBAAwB,CAAC,kBAAkB,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;IACpG,MAAM,sBAAsB,GAAG,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;IAExE,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,IAAI,cAAc,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACvC,KAAK,CAAC,4BAA4B,sBAAsB,EAAE,CAAC,CAAC;YAC5D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,4BAA4B,sBAAsB,EAAE,EAAE,CAAC;QAC1F,CAAC;QAED,KAAK,CAAC,aAAa,sBAAsB,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,8EAA8E,CAAC,CAAC;QACrF,IAAI,CAAC,gHAAgH,CAAC,CAAC;QACvH,IAAI,CAAC,sEAAsE,CAAC,CAAC;QAC7E,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,sBAAsB,cAAc,EAAE,CAAC;IACvF,CAAC;IACD,GAAG,CAAC,KAAK,CAAC,kBAAkB,EAAE;QAC5B,IAAI,EAAE,cAAc,CAAC,IAAI;QACzB,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;KACjE,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,2BAA2B,CAAC,UAAU,EAAE,CAAC,UAAU,EAAE,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAC7G,MAAM,eAAe,GAAG,+BAA+B,CAAC,UAAU,CAAC,CAAC;IACpE,OAAO,gBAAgB,CAAC,cAAc,EAAE,IAAI,EAAE,GAAG,EAAE;QACjD,UAAU;QACV,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,QAAQ,EAAE,cAAc,EAAE,QAAQ;QAClC,KAAK,EAAE,cAAc,EAAE,KAAK;QAC5B,eAAe,EAAE,eAAe,CAAC,KAAK;QACtC,qBAAqB,EAAE,eAAe,CAAC,MAAM;QAC7C,6BAA6B,EAAE,eAAe,CAAC,cAAc;QAC7D,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,oBAAoB;QACpB,mBAAmB;QACnB,SAAS;QACT,SAAS;QACT,WAAW;QACX,YAAY;QACZ,aAAa;QACb,WAAW;QACX,UAAU;QACV,cAAc;QACd,gBAAgB;QAChB,gBAAgB;QAChB,wBAAwB;QACxB,sBAAsB;KACvB,CAAC,CAAC;AACL,CAAC"}

package/dist/features/tasks/execute/traceReportRedaction.d.ts

@@ -1,5 +1,4 @@
 import type { TraceStep, TraceReportMode, TraceReportParams } from './traceReportTypes.js';
-export declare function sanitizeSensitiveText(text: string): string;
 export declare function cloneStepsForMode(steps: TraceStep[], mode: TraceReportMode): TraceStep[];
 export declare function sanitizeTraceParamsForMode(params: TraceReportParams, mode: TraceReportMode): TraceReportParams;
 export declare function sanitizeTextForStorage(text: string, allowFullText: boolean): string;

package/dist/features/tasks/execute/traceReportRedaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"traceReportRedaction.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/execute/traceReportRedaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,eAAe,EACf,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAE/B,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAU1D;AAYD,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,SAAS,EAAE,EAClB,IAAI,EAAE,eAAe,GACpB,SAAS,EAAE,CAyBb;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,eAAe,GACpB,iBAAiB,CASnB;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,GAAG,MAAM,CAQnF"}
+{"version":3,"file":"traceReportRedaction.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/execute/traceReportRedaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,eAAe,EACf,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAa/B,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,SAAS,EAAE,EAClB,IAAI,EAAE,eAAe,GACpB,SAAS,EAAE,CAyBb;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,eAAe,GACpB,iBAAiB,CASnB;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,GAAG,MAAM,CAQnF"}

package/dist/features/tasks/execute/traceReportRedaction.js

@@ -1,12 +1,4 @@
-export function sanitizeSensitiveText(text) {
-    if (!text)
-        return text;
-    return text
-        .replace(/(Authorization\s*:\s*Bearer\s+)([^\s]+)/gi, '$1[REDACTED]')
-        .replace(/(["']?(?:api[_-]?key|token|password|secret|access[_-]?token|refresh[_-]?token)["']?\s*[:=]\s*["']?)([^"',\s}\]]+)(["']?)/gi, '$1[REDACTED]$3')
-        .replace(/([?&](?:api[_-]?key|token|password|secret)=)([^&\s]+)/gi, '$1[REDACTED]')
-        .replace(/\b(?:sk-[A-Za-z0-9]{8,}|ghp_[A-Za-z0-9]{8,}|xox[baprs]-[A-Za-z0-9-]{8,})\b/g, '[REDACTED]');
-}
+import { sanitizeSensitiveText } from '../../../shared/utils/sensitiveText.js';
 function transformText(text, mode) {
     if (!text) {
         return text;

package/dist/features/tasks/execute/traceReportRedaction.js.map

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