@serviceme/devtools-cli 0.1.3 → 0.1.4

package/dist/bridgeServer.js

@@ -4,8 +4,9 @@
 var readline = require('readline');
 var child_process = require('child_process');
 require('fs/promises');
-require('path');
-require('fs');
+var path5 = require('path');
+var fs6 = require('fs');
+require('os');
 require('crypto');
 
 function _interopNamespace(e) {
@@ -27,6 +28,8 @@ function _interopNamespace(e) {
 }
 
 var readline__namespace = /*#__PURE__*/_interopNamespace(readline);
+var path5__namespace = /*#__PURE__*/_interopNamespace(path5);
+var fs6__namespace = /*#__PURE__*/_interopNamespace(fs6);
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -297,9 +300,9 @@ var require_esprima = __commonJS({
                 });
               };
               CommentHandler2.prototype.visitComment = function(node, metadata) {
-                var type = node.type[0] === "L" ? "Line" : "Block";
+                var type2 = node.type[0] === "L" ? "Line" : "Block";
                 var comment = {
-                  type,
+                  type: type2,
                   value: node.value
                 };
                 if (node.range) {
@@ -312,7 +315,7 @@ var require_esprima = __commonJS({
                 if (this.attach) {
                   var entry = {
                     comment: {
-                      type,
+                      type: type2,
                       value: node.value,
                       range: [metadata.start.offset, metadata.end.offset]
                     },
@@ -321,7 +324,7 @@ var require_esprima = __commonJS({
                   if (node.loc) {
                     entry.comment.loc = node.loc;
                   }
-                  node.type = type;
+                  node.type = type2;
                   this.leading.push(entry);
                   this.trailing.push(entry);
                 }
@@ -5136,28 +5139,28 @@ var require_esprima = __commonJS({
                 };
               };
               Scanner2.prototype.scanIdentifier = function() {
-                var type;
+                var type2;
                 var start = this.index;
                 var id = this.source.charCodeAt(start) === 92 ? this.getComplexIdentifier() : this.getIdentifier();
                 if (id.length === 1) {
-                  type = 3;
+                  type2 = 3;
                 } else if (this.isKeyword(id)) {
-                  type = 4;
+                  type2 = 4;
                 } else if (id === "null") {
-                  type = 5;
+                  type2 = 5;
                 } else if (id === "true" || id === "false") {
-                  type = 1;
+                  type2 = 1;
                 } else {
-                  type = 3;
+                  type2 = 3;
                 }
-                if (type !== 3 && start + id.length !== this.index) {
+                if (type2 !== 3 && start + id.length !== this.index) {
                   var restore = this.index;
                   this.index = start;
                   this.tolerateUnexpectedToken(messages_1.Messages.InvalidEscapedReservedWord);
                   this.index = restore;
                 }
                 return {
-                  type,
+                  type: type2,
                   value: id,
                   lineNumber: this.lineNumber,
                   lineStart: this.lineStart,
@@ -7608,13 +7611,13 @@ var require_parse = __commonJS({
       last = current;
       current = new_token;
     };
-    var type = () => {
+    var type2 = () => {
       if (!current) {
         unexpected_end();
       }
       return current.type === "Punctuator" ? current.value : current.type;
     };
-    var is = (t) => type() === t;
+    var is = (t) => type2() === t;
     var expect = (a) => {
       if (!is(a)) {
         unexpected();
@@ -7769,7 +7772,7 @@ var require_parse = __commonJS({
       return array;
     };
     function walk() {
-      let tt = type();
+      let tt = type2();
       if (tt === CURLY_BRACKET_OPEN) {
         next();
         return {
@@ -7785,7 +7788,7 @@ var require_parse = __commonJS({
       let negative = EMPTY;
       if (tt === MINUS) {
         next();
-        tt = type();
+        tt = type2();
         negative = MINUS;
       }
       let v;
@@ -7911,11 +7914,11 @@ var require_stringify = __commonJS({
       let is_line_comment = false;
       const str = comments.reduce((prev, {
         inline,
-        type,
+        type: type2,
         value
       }) => {
         const delimiter = inline ? SPACE : LF + deeper_gap;
-        is_line_comment = type === "LineComment";
+        is_line_comment = type2 === "LineComment";
         return prev + delimiter + comment_stringify(value, is_line_comment);
       }, EMPTY);
       return display_block || is_line_comment ? str + LF + deeper_gap : str;
@@ -8143,7 +8146,7 @@ var require_pend = __commonJS({
 // ../../node_modules/.pnpm/yauzl@3.2.0/node_modules/yauzl/fd-slicer.js
 var require_fd_slicer = __commonJS({
   "../../node_modules/.pnpm/yauzl@3.2.0/node_modules/yauzl/fd-slicer.js"(exports$1) {
-    var fs8 = __require("fs");
+    var fs10 = __require("fs");
     var util = __require("util");
     var stream = __require("stream");
     var Readable = stream.Readable;
@@ -8168,7 +8171,7 @@ var require_fd_slicer = __commonJS({
     FdSlicer.prototype.read = function(buffer, offset, length, position, callback) {
       var self = this;
       self.pend.go(function(cb) {
-        fs8.read(self.fd, buffer, offset, length, position, function(err, bytesRead, buffer2) {
+        fs10.read(self.fd, buffer, offset, length, position, function(err, bytesRead, buffer2) {
           cb();
           callback(err, bytesRead, buffer2);
         });
@@ -8177,7 +8180,7 @@ var require_fd_slicer = __commonJS({
     FdSlicer.prototype.write = function(buffer, offset, length, position, callback) {
       var self = this;
       self.pend.go(function(cb) {
-        fs8.write(self.fd, buffer, offset, length, position, function(err, written, buffer2) {
+        fs10.write(self.fd, buffer, offset, length, position, function(err, written, buffer2) {
           cb();
           callback(err, written, buffer2);
         });
@@ -8198,7 +8201,7 @@ var require_fd_slicer = __commonJS({
       if (self.refCount > 0) return;
       if (self.refCount < 0) throw new Error("invalid unref");
       if (self.autoClose) {
-        fs8.close(self.fd, onCloseDone);
+        fs10.close(self.fd, onCloseDone);
       }
       function onCloseDone(err) {
         if (err) {
@@ -8235,7 +8238,7 @@ var require_fd_slicer = __commonJS({
       self.context.pend.go(function(cb) {
         if (self.destroyed) return cb();
         var buffer = Buffer.allocUnsafe(toRead);
-        fs8.read(self.context.fd, buffer, 0, toRead, self.pos, function(err, bytesRead) {
+        fs10.read(self.context.fd, buffer, 0, toRead, self.pos, function(err, bytesRead) {
           if (err) {
             self.destroy(err);
           } else if (bytesRead === 0) {
@@ -8282,7 +8285,7 @@ var require_fd_slicer = __commonJS({
       }
       self.context.pend.go(function(cb) {
         if (self.destroyed) return cb();
-        fs8.write(self.context.fd, buffer, 0, buffer.length, self.pos, function(err2, bytes) {
+        fs10.write(self.context.fd, buffer, 0, buffer.length, self.pos, function(err2, bytes) {
           if (err2) {
             self.destroy();
             cb();
@@ -8720,7 +8723,7 @@ var require_buffer_crc32 = __commonJS({
 // ../../node_modules/.pnpm/yauzl@3.2.0/node_modules/yauzl/index.js
 var require_yauzl = __commonJS({
   "../../node_modules/.pnpm/yauzl@3.2.0/node_modules/yauzl/index.js"(exports$1) {
-    var fs8 = __require("fs");
+    var fs10 = __require("fs");
     var zlib = __require("zlib");
     var fd_slicer = require_fd_slicer();
     var crc32 = require_buffer_crc32();
@@ -8741,7 +8744,7 @@ var require_yauzl = __commonJS({
     exports$1.Entry = Entry;
     exports$1.LocalFileHeader = LocalFileHeader;
     exports$1.RandomAccessReader = RandomAccessReader;
-    function open2(path7, options2, callback) {
+    function open2(path8, options2, callback) {
       if (typeof options2 === "function") {
         callback = options2;
         options2 = null;
@@ -8753,10 +8756,10 @@ var require_yauzl = __commonJS({
       if (options2.validateEntrySizes == null) options2.validateEntrySizes = true;
       if (options2.strictFileNames == null) options2.strictFileNames = false;
       if (callback == null) callback = defaultCallback;
-      fs8.open(path7, "r", function(err, fd) {
+      fs10.open(path8, "r", function(err, fd) {
         if (err) return callback(err);
         fromFd(fd, options2, function(err2, zipfile) {
-          if (err2) fs8.close(fd, defaultCallback);
+          if (err2) fs10.close(fd, defaultCallback);
           callback(err2, zipfile);
         });
       });
@@ -8773,7 +8776,7 @@ var require_yauzl = __commonJS({
       if (options2.validateEntrySizes == null) options2.validateEntrySizes = true;
       if (options2.strictFileNames == null) options2.strictFileNames = false;
       if (callback == null) callback = defaultCallback;
-      fs8.fstat(fd, function(err, stats) {
+      fs10.fstat(fd, function(err, stats) {
         if (err) return callback(err);
         var reader = fd_slicer.createFromFd(fd, { autoClose: true });
         fromRandomAccessReader(reader, stats.size, options2, callback);
@@ -9597,7 +9600,7 @@ function normalizeServicemeError(error, fallbackCode = "internal_error") {
 }
 
 // src/version.ts
-var SERVICEME_CLI_VERSION = "0.1.3";
+var SERVICEME_CLI_VERSION = "0.1.4";
 
 // src/bridge/ndjson.ts
 function writeBridgeMessage(message) {
@@ -9630,7 +9633,8 @@ async function runCommand(command, options2 = {}) {
       cwd: options2.cwd,
       env: options2.env,
       shell: options2.shell,
-      stdio: "pipe"
+      stdio: "pipe",
+      windowsHide: true
     });
     let stdout = "";
     let stderr = "";
@@ -9717,8 +9721,45 @@ __toESM(require_src2());
 
 // ../../packages/serviceme-core/src/utils/fileUtils.ts
 __toESM(require_yauzl());
-var DEFAULT_TIMEOUT = 3e5;
+
+// ../../packages/serviceme-core/src/scheduled-tasks/executors/timeout.ts
+function resolveConfiguredTimeoutMs(timeoutSeconds, defaultTimeoutMs) {
+  if (timeoutSeconds === 0) {
+    return void 0;
+  }
+  if (typeof timeoutSeconds !== "number" || !Number.isFinite(timeoutSeconds) || timeoutSeconds < 0) {
+    return defaultTimeoutMs;
+  }
+  return timeoutSeconds * 1e3;
+}
+
+// ../../packages/serviceme-core/src/scheduled-tasks/executors/GithubCopilotCliExecutor.ts
 var MAX_OUTPUT_BYTES = 2 * 1024 * 1024;
+var DEFAULT_TIMEOUT_MS = 3e5;
+function redactArgs(args) {
+  const redacted = [];
+  let redactNext = false;
+  for (const arg of args) {
+    if (redactNext) {
+      redacted.push("<redacted>");
+      redactNext = false;
+      continue;
+    }
+    redacted.push(arg);
+    if (arg === "--prompt") {
+      redactNext = true;
+    }
+  }
+  return redacted;
+}
+function writeDiagnostic(message) {
+  const logPath = process.env.SERVICEME_SCHEDULER_LOG_PATH;
+  if (logPath) {
+    fs6__namespace.appendFileSync(logPath, message);
+    return;
+  }
+  process.stderr.write(message);
+}
 var GithubCopilotCliExecutor = class {
   async execute(payload, abortSignal) {
     const authenticated = await isCopilotAuthenticated();
@@ -9741,7 +9782,7 @@ var GithubCopilotCliExecutor = class {
   }
   executeStreaming(payload, onOutput, abortSignal) {
     const p = payload;
-    const timeout = (p.timeout != null ? p.timeout * 1e3 : null) ?? DEFAULT_TIMEOUT;
+    const timeoutMs = resolveConfiguredTimeoutMs(p.timeout, DEFAULT_TIMEOUT_MS);
     let resolve;
     const resultPromise = new Promise((r) => {
       resolve = r;
@@ -9750,7 +9791,7 @@ var GithubCopilotCliExecutor = class {
     const settle = (result) => {
       if (settled) return;
       settled = true;
-      clearTimeout(timer);
+      if (timer) clearTimeout(timer);
       resolve?.(result);
     };
     if (abortSignal?.aborted) {
@@ -9776,23 +9817,32 @@ var GithubCopilotCliExecutor = class {
     if (p.agent) {
       args.push("--agent", p.agent);
     }
-    if (p.timeout != null) {
-      args.push("--timeout", String(p.timeout));
-    }
+    args.push("--timeout", String(p.timeout ?? 0));
+    writeDiagnostic(
+      `[GithubCopilotCliExecutor] spawn: command=serviceme, args=${JSON.stringify(redactArgs(args))}, promptLen=${p.prompt.length}, cwd=${p.workspace ?? "(default)"}, platform=${process.platform}, windowsHide=true, pid=${process.pid}
+`
+    );
     const child = child_process.spawn("serviceme", args, {
       cwd: p.workspace,
-      stdio: ["ignore", "pipe", "pipe"]
+      stdio: ["ignore", "pipe", "pipe"],
+      windowsHide: true
     });
-    const timer = setTimeout(() => {
+    if (child.pid) {
+      writeDiagnostic(
+        `[GithubCopilotCliExecutor] spawned child PID=${child.pid}
+`
+      );
+    }
+    const timer = timeoutMs != null ? setTimeout(() => {
       child.kill("SIGTERM");
       setTimeout(() => {
         if (!child.killed) child.kill("SIGKILL");
       }, 5e3);
       settle({
         status: "timeout",
-        error: `Copilot CLI execution timed out after ${timeout / 1e3}s`
+        error: `Copilot CLI execution timed out after ${timeoutMs / 1e3}s`
       });
-    }, timeout);
+    }, timeoutMs) : void 0;
     let stdoutBuf = "";
     let stderrBuf = "";
     child.stdout.on("data", (chunk) => {
@@ -9836,17 +9886,19 @@ var GithubCopilotCliExecutor = class {
 };
 
 // ../../packages/serviceme-core/src/scheduled-tasks/executors/HttpRequestExecutor.ts
-var DEFAULT_TIMEOUT2 = 3e4;
+var DEFAULT_TIMEOUT_MS2 = 3e4;
 var HttpRequestExecutor = class {
   async execute(payload, abortSignal) {
     const p = payload;
-    const timeout = (p.timeout != null ? p.timeout * 1e3 : null) ?? DEFAULT_TIMEOUT2;
+    const timeoutMs = resolveConfiguredTimeoutMs(p.timeout, DEFAULT_TIMEOUT_MS2);
     const ac = new AbortController();
-    const timer = setTimeout(() => {
+    let timedOut = false;
+    const timer = timeoutMs != null ? setTimeout(() => {
+      timedOut = true;
       ac.abort();
-    }, timeout);
+    }, timeoutMs) : void 0;
     if (abortSignal?.aborted) {
-      clearTimeout(timer);
+      if (timer) clearTimeout(timer);
       return { status: "cancelled", error: "Execution aborted" };
     }
     let externalAbort = false;
@@ -9854,7 +9906,7 @@ var HttpRequestExecutor = class {
       "abort",
       () => {
         externalAbort = true;
-        clearTimeout(timer);
+        if (timer) clearTimeout(timer);
         ac.abort();
       },
       { once: true }
@@ -9866,7 +9918,7 @@ var HttpRequestExecutor = class {
         body: p.body,
         signal: ac.signal
       });
-      clearTimeout(timer);
+      if (timer) clearTimeout(timer);
       const body = await response.text();
       if (response.ok) {
         return {
@@ -9881,14 +9933,17 @@ ${body}`.trim()
 ${body}`.trim()
       };
     } catch (err) {
-      clearTimeout(timer);
+      if (timer) clearTimeout(timer);
       if (err instanceof Error && err.name === "AbortError") {
         if (externalAbort) {
           return { status: "cancelled", error: "Execution cancelled" };
         }
+        if (!timedOut || timeoutMs == null) {
+          return { status: "failure", error: err.message };
+        }
         return {
           status: "timeout",
-          error: `HTTP request timed out after ${timeout / 1e3}s`
+          error: `HTTP request timed out after ${timeoutMs / 1e3}s`
         };
       }
       const message = err instanceof Error ? err.message : String(err);
@@ -9896,8 +9951,80 @@ ${body}`.trim()
     }
   }
 };
-var DEFAULT_TIMEOUT3 = 6e4;
 var MAX_OUTPUT_BYTES2 = 1024 * 1024;
+var DEFAULT_TIMEOUT_MS3 = 6e4;
+var POSIX_SHELL_CANDIDATES = ["bash.exe", "sh.exe"];
+function resolveShellExecution(script, options2 = {}) {
+  const platform = options2.platform ?? process.platform;
+  const env = options2.env ?? process.env;
+  const fileExists = options2.fileExists ?? fs6__namespace.existsSync;
+  if (platform === "win32") {
+    const posixShell = usesPosixShellSyntax(script) ? findWindowsPosixShell(env, fileExists) : null;
+    if (posixShell) {
+      return {
+        command: posixShell,
+        args: ["-s"],
+        stdinScript: script,
+        outputEncoding: "utf8",
+        shellKind: "posix"
+      };
+    }
+    return {
+      command: env.ComSpec ?? env.COMSPEC ?? "cmd.exe",
+      args: ["/d", "/s", "/c", script],
+      outputEncoding: "utf8",
+      shellKind: "cmd"
+    };
+  }
+  return {
+    command: "sh",
+    args: ["-s"],
+    stdinScript: script,
+    outputEncoding: "utf8",
+    shellKind: "posix"
+  };
+}
+function usesPosixShellSyntax(script) {
+  return /\$\([^)]*\)|`[^`]*`/.test(script);
+}
+function findWindowsPosixShell(env, fileExists) {
+  const explicitShell = env.SERVICEME_POSIX_SHELL;
+  if (explicitShell && fileExists(explicitShell)) {
+    return explicitShell;
+  }
+  const knownGitBashPaths = [
+    "C:\\Program Files\\Git\\bin\\bash.exe",
+    "C:\\Program Files\\Git\\usr\\bin\\bash.exe",
+    "C:\\Program Files (x86)\\Git\\bin\\bash.exe",
+    "C:\\Program Files (x86)\\Git\\usr\\bin\\bash.exe"
+  ];
+  for (const candidate of knownGitBashPaths) {
+    if (fileExists(candidate)) return candidate;
+  }
+  const pathValue = env.Path ?? env.PATH ?? "";
+  for (const dir of pathValue.split(path5__namespace.win32.delimiter)) {
+    if (!dir) continue;
+    for (const executable of POSIX_SHELL_CANDIDATES) {
+      const candidate = path5__namespace.win32.join(dir, executable);
+      if (fileExists(candidate) && !isWindowsWslLauncher(candidate)) {
+        return candidate;
+      }
+    }
+  }
+  return null;
+}
+function isWindowsWslLauncher(candidate) {
+  const normalized = path5__namespace.win32.normalize(candidate).toLowerCase();
+  return normalized.endsWith("\\windows\\system32\\bash.exe") || normalized.endsWith("\\windows\\syswow64\\bash.exe");
+}
+function writeDiagnostic2(message) {
+  const logPath = process.env.SERVICEME_SCHEDULER_LOG_PATH;
+  if (logPath) {
+    fs6__namespace.appendFileSync(logPath, message);
+    return;
+  }
+  process.stderr.write(message);
+}
 var ShellExecutor = class {
   async execute(payload, abortSignal) {
     let output = "";
@@ -9913,7 +10040,7 @@ var ShellExecutor = class {
   }
   executeStreaming(payload, onOutput, abortSignal) {
     const p = payload;
-    const timeout = (p.timeout != null ? p.timeout * 1e3 : null) ?? DEFAULT_TIMEOUT3;
+    const timeoutMs = resolveConfiguredTimeoutMs(p.timeout, DEFAULT_TIMEOUT_MS3);
     let resolve;
     const resultPromise = new Promise((r) => {
       resolve = r;
@@ -9922,7 +10049,7 @@ var ShellExecutor = class {
     const settle = (result) => {
       if (settled) return;
       settled = true;
-      clearTimeout(timer);
+      if (timer) clearTimeout(timer);
       resolve?.(result);
     };
     if (abortSignal?.aborted) {
@@ -9935,37 +10062,65 @@ var ShellExecutor = class {
         }
       };
     }
-    const child = child_process.spawn("sh", ["-c", p.script], {
+    const shellExecution = resolveShellExecution(p.script);
+    const spawnOpts = {
       cwd: p.cwd,
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-    const timer = setTimeout(() => {
+      stdio: [shellExecution.stdinScript ? "pipe" : "ignore", "pipe", "pipe"],
+      windowsHide: true
+    };
+    writeDiagnostic2(
+      `[ShellExecutor] spawn:
+  platform=${process.platform}
+  shell=${shellExecution.shellKind}
+  command=${shellExecution.command}
+  args=${JSON.stringify(shellExecution.args.filter((a) => a !== p.script))}
+  stdin=${shellExecution.stdinScript ? "true" : "false"}
+  cwd=${p.cwd ?? "(default)"}
+  timeout=${timeoutMs != null ? `${timeoutMs}ms` : "unlimited"}
+  scriptLen=${p.script.length}
+  windowsHide=true
+  daemonPid=${process.pid}
+`
+    );
+    const child = child_process.spawn(shellExecution.command, shellExecution.args, spawnOpts);
+    if (shellExecution.stdinScript && child.stdin) {
+      child.stdin.end(shellExecution.stdinScript);
+    }
+    if (child.pid) {
+      writeDiagnostic2(`[ShellExecutor] spawned child PID=${child.pid}
+`);
+    }
+    const timer = timeoutMs != null ? setTimeout(() => {
       child.kill("SIGTERM");
       setTimeout(() => {
         if (!child.killed) child.kill("SIGKILL");
       }, 5e3);
       settle({
         status: "timeout",
-        error: `Shell execution timed out after ${timeout / 1e3}s`
+        error: `Shell execution timed out after ${timeoutMs / 1e3}s`
       });
-    }, timeout);
+    }, timeoutMs) : void 0;
     let stdoutBuf = "";
     let stderrBuf = "";
-    child.stdout.on("data", (chunk) => {
-      const data = chunk.toString();
+    child.stdout?.on("data", (chunk) => {
+      const data = chunk.toString(shellExecution.outputEncoding);
       stdoutBuf += data;
       if (stdoutBuf.length > MAX_OUTPUT_BYTES2)
         stdoutBuf = stdoutBuf.slice(-MAX_OUTPUT_BYTES2);
       onOutput("stdout", data);
     });
-    child.stderr.on("data", (chunk) => {
-      const data = chunk.toString();
+    child.stderr?.on("data", (chunk) => {
+      const data = chunk.toString(shellExecution.outputEncoding);
       stderrBuf += data;
       if (stderrBuf.length > MAX_OUTPUT_BYTES2)
         stderrBuf = stderrBuf.slice(-MAX_OUTPUT_BYTES2);
       onOutput("stderr", data);
     });
     child.on("close", (code) => {
+      writeDiagnostic2(
+        `[ShellExecutor] child PID=${child.pid} exited: code=${code}
+`
+      );
       if (code === 0) {
         settle({ status: "success", output: stdoutBuf || void 0 });
       } else {
@@ -10009,8 +10164,59 @@ function getExecutor(taskType) {
   }
   return executor;
 }
+function isRecord3(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function requireNonEmptyString(payload, field, taskType) {
+  if (!isRecord3(payload) || typeof payload[field] !== "string" || !payload[field].trim()) {
+    throw createServicemeError(
+      "invalid_payload",
+      `${taskType} payload ${field} is required`
+    );
+  }
+}
+function validateTaskPayload(taskType, payload) {
+  switch (taskType) {
+    case "command":
+      requireNonEmptyString(payload, "command", taskType);
+      return;
+    case "shell":
+      requireNonEmptyString(payload, "script", taskType);
+      return;
+    case "http_request":
+      requireNonEmptyString(payload, "url", taskType);
+      requireNonEmptyString(payload, "method", taskType);
+      return;
+    case "github_copilot_cli":
+      requireNonEmptyString(payload, "prompt", taskType);
+      return;
+  }
+}
 
 // ../../packages/serviceme-core/src/scheduled-tasks/TaskExecutionEngine.ts
+function hasNonEmptyString(value) {
+  return typeof value === "string" && value.trim().length > 0;
+}
+function resolveTaskExecutionPayload(taskType, payload, workspacePath) {
+  if (!hasNonEmptyString(workspacePath)) {
+    return payload;
+  }
+  if (taskType === "shell") {
+    const shellPayload = payload;
+    if (hasNonEmptyString(shellPayload.cwd)) {
+      return shellPayload;
+    }
+    return { ...shellPayload, cwd: workspacePath };
+  }
+  if (taskType === "github_copilot_cli") {
+    const copilotPayload = payload;
+    if (hasNonEmptyString(copilotPayload.workspace)) {
+      return copilotPayload;
+    }
+    return { ...copilotPayload, workspace: workspacePath };
+  }
+  return payload;
+}
 var TaskExecutionEngine = class {
   constructor(getExecutor2) {
     this.getExecutor = getExecutor2;
@@ -10031,7 +10237,6 @@ var TaskExecutionEngine = class {
         );
       }
     }
-    const executor = this.getExecutor(snapshot.type);
     const startedAt = (/* @__PURE__ */ new Date()).toISOString();
     if (!this.taskExecutions.has(snapshot.taskId)) {
       this.taskExecutions.set(snapshot.taskId, /* @__PURE__ */ new Set());
@@ -10051,10 +10256,17 @@ var TaskExecutionEngine = class {
       startedAt
     });
     try {
+      const executionPayload = resolveTaskExecutionPayload(
+        snapshot.type,
+        snapshot.payload,
+        snapshot.workspacePath
+      );
+      validateTaskPayload(snapshot.type, executionPayload);
+      const executor = this.getExecutor(snapshot.type);
       let result;
       if (isStreamingTaskExecutor(executor)) {
         const handle = executor.executeStreaming(
-          snapshot.payload,
+          executionPayload,
           (stream, data) => {
             this.listener?.onOutput({
               executionId: snapshot.executionId,
@@ -10070,7 +10282,7 @@ var TaskExecutionEngine = class {
         };
         result = await handle.result;
       } else {
-        result = await executor.execute(snapshot.payload, ac.signal);
+        result = await executor.execute(executionPayload, ac.signal);
       }
       const log = {
         id: snapshot.executionId,