meshy-node 0.1.10 → 0.2.2

package/main.cjs

@@ -32727,7 +32727,7 @@ function parseTask(value) {
   }
   const status = asTaskStatus(value.status);
   const priority = asTaskPriority(value.priority);
-  if (typeof value.id !== "string" || typeof value.title !== "string" || typeof value.description !== "string" || typeof value.agent !== "string" || value.project !== null && typeof value.project !== "string" || value.effectiveProjectPath !== null && value.effectiveProjectPath !== void 0 && typeof value.effectiveProjectPath !== "string" || !isPlainObject(value.payload) || status === null || priority === null || value.assignedTo !== null && typeof value.assignedTo !== "string" || value.assignedNodeName !== void 0 && value.assignedNodeName !== null && typeof value.assignedNodeName !== "string" || typeof value.createdBy !== "string" || value.result !== null && !isPlainObject(value.result) || value.error !== null && typeof value.error !== "string" || typeof value.retryCount !== "number" || !Number.isFinite(value.retryCount) || typeof value.maxRetries !== "number" || !Number.isFinite(value.maxRetries) || typeof value.createdAt !== "number" || !Number.isFinite(value.createdAt) || typeof value.updatedAt !== "number" || !Number.isFinite(value.updatedAt)) {
+  if (typeof value.id !== "string" || typeof value.title !== "string" || typeof value.description !== "string" || typeof value.agent !== "string" || value.project !== null && typeof value.project !== "string" || value.effectiveProjectPath !== null && value.effectiveProjectPath !== void 0 && typeof value.effectiveProjectPath !== "string" || value.branch !== null && value.branch !== void 0 && typeof value.branch !== "string" || !isPlainObject(value.payload) || status === null || priority === null || value.assignedTo !== null && typeof value.assignedTo !== "string" || value.assignedNodeName !== void 0 && value.assignedNodeName !== null && typeof value.assignedNodeName !== "string" || typeof value.createdBy !== "string" || value.result !== null && !isPlainObject(value.result) || value.error !== null && typeof value.error !== "string" || typeof value.retryCount !== "number" || !Number.isFinite(value.retryCount) || typeof value.maxRetries !== "number" || !Number.isFinite(value.maxRetries) || typeof value.createdAt !== "number" || !Number.isFinite(value.createdAt) || typeof value.updatedAt !== "number" || !Number.isFinite(value.updatedAt)) {
     return null;
   }
   return {
@@ -32737,6 +32737,7 @@ function parseTask(value) {
     agent: value.agent,
     project: value.project ?? null,
     effectiveProjectPath: typeof value.effectiveProjectPath === "string" ? value.effectiveProjectPath : null,
+    branch: value.branch === void 0 ? void 0 : typeof value.branch === "string" ? value.branch : null,
     payload: clone(value.payload),
     status,
     priority,
@@ -33350,6 +33351,7 @@ var TaskEngine = class {
       agent: input.agent,
       project: input.project ?? null,
       effectiveProjectPath: null,
+      branch: input.branch ?? null,
       payload: input.payload,
       status: "pending",
       priority: input.priority ?? "normal",
@@ -33593,10 +33595,12 @@ var TaskEngine = class {
     const now = Date.now();
     const existing = this.store.getTask(task.id);
     const effectiveProjectPath = task.effectiveProjectPath ?? existing?.effectiveProjectPath ?? null;
+    const branch = task.branch ?? existing?.branch ?? null;
     if (!existing) {
       this.store.createTask({
         ...task,
         effectiveProjectPath,
+        branch,
         status: "running",
         updatedAt: now
       });
@@ -33604,6 +33608,7 @@ var TaskEngine = class {
       this.store.updateTask(task.id, {
         status: "running",
         effectiveProjectPath,
+        branch,
         updatedAt: now
       });
     }
@@ -34951,6 +34956,7 @@ function buildLeaderTaskPatch(data) {
   if (data.result !== void 0) body.result = data.result;
   if (data.error !== void 0) body.error = data.error;
   if (data.effectiveProjectPath !== void 0) body.effectiveProjectPath = data.effectiveProjectPath;
+  if (data.branch !== void 0) body.branch = data.branch;
   if (data.status === "pending") body.assignedTo = null;
   return body;
 }
@@ -34992,9 +34998,10 @@ function forwardLeaderTaskPatch(log2, nodeRegistry, taskId, data, options) {
     });
   });
 }
-function forwardRunningStatusToLeader(log2, nodeRegistry, taskId, effectiveProjectPath) {
+function forwardRunningStatusToLeader(log2, nodeRegistry, taskId, effectiveProjectPath, branch) {
   const data = { status: "running" };
   if (effectiveProjectPath !== void 0) data.effectiveProjectPath = effectiveProjectPath;
+  if (branch !== void 0) data.branch = branch;
   forwardLeaderTaskPatch(log2, nodeRegistry, taskId, data, {
     successMessage: "forwarded running status to leader",
     rejectedMessage: "leader rejected running status update",
@@ -40783,6 +40790,12 @@ var NodeWorkDirEntrySchema = external_exports.object({
   mimeType: external_exports.string().optional(),
   kind: external_exports.enum(["text", "json", "markdown", "image", "html", "pdf", "binary"]).optional()
 });
+var GitRemoteBranchOptionSchema = external_exports.object({
+  name: external_exports.string(),
+  remote: external_exports.enum(["origin", "upstream"]),
+  branch: external_exports.string(),
+  ref: external_exports.string()
+});
 var NodeListQuery = external_exports.object({
   status: external_exports.enum(["online", "busy", "offline"]).optional(),
   capability: external_exports.string().optional()
@@ -40806,6 +40819,12 @@ var NodeWorkDirTreeQuery = external_exports.object({
   directoriesOnly: QueryBoolean,
   allowAbsolute: QueryBoolean
 });
+var NodeWorkDirBranchQuery = external_exports.object({
+  path: external_exports.string().default("."),
+  limit: external_exports.coerce.number().int().min(1).max(20).default(20),
+  offset: external_exports.coerce.number().int().min(0).default(0),
+  allowAbsolute: QueryBoolean
+});
 var NodeWorkDirTreeResponse = external_exports.object({
   nodeId: external_exports.string(),
   rootPath: external_exports.string(),
@@ -40819,6 +40838,29 @@ var NodeWorkDirTreeResponse = external_exports.object({
   isAbsolute: external_exports.boolean(),
   parentPath: external_exports.string().nullable()
 });
+var NodeWorkDirBranchResponse = external_exports.object({
+  nodeId: external_exports.string(),
+  path: external_exports.string(),
+  available: external_exports.boolean(),
+  repoRoot: external_exports.string().nullable(),
+  currentBranch: external_exports.string().nullable(),
+  branches: external_exports.array(GitRemoteBranchOptionSchema),
+  limit: external_exports.number().int().min(1),
+  offset: external_exports.number().int().min(0),
+  total: external_exports.number().int().min(0),
+  hasMore: external_exports.boolean()
+});
+var CreateNodeWorkDirBranchBody = external_exports.object({
+  path: external_exports.string().default("."),
+  branchName: external_exports.string().trim().min(1),
+  startPoint: external_exports.string().trim().min(1),
+  limit: external_exports.coerce.number().int().min(1).max(20).default(20),
+  offset: external_exports.coerce.number().int().min(0).default(0),
+  allowAbsolute: external_exports.boolean().default(true)
+});
+var CreateNodeWorkDirBranchResponse = NodeWorkDirBranchResponse.extend({
+  createdBranch: external_exports.string()
+});
 var UpdateNodeBody = external_exports.object({
   name: external_exports.string().min(1).optional(),
   capabilities: external_exports.array(external_exports.string()).optional()
@@ -40842,6 +40884,7 @@ var CreateTaskBody = external_exports.object({
   description: external_exports.string().default(""),
   agent: external_exports.enum(AGENT_OPTIONS),
   project: external_exports.string().nullable().optional().default(null),
+  branch: external_exports.string().nullable().optional().default(null),
   payload: TaskPayload.default({}),
   priority: external_exports.enum(["low", "normal", "high", "critical"]).default("normal"),
   assignTo: external_exports.string().optional()
@@ -40861,6 +40904,7 @@ var TaskListResponse = external_exports.object({
     agent: external_exports.string(),
     project: external_exports.string().nullable(),
     effectiveProjectPath: external_exports.string().nullable(),
+    branch: external_exports.string().nullable().optional(),
     payload: external_exports.record(external_exports.unknown()),
     status: external_exports.enum(["pending", "assigned", "running", "completed", "failed", "cancelled", "archived"]),
     priority: external_exports.enum(["low", "normal", "high", "critical"]),
@@ -40883,7 +40927,8 @@ var UpdateTaskBody = external_exports.object({
   status: external_exports.enum(["pending", "assigned", "running", "completed", "failed", "cancelled", "archived"]).optional(),
   result: external_exports.record(external_exports.unknown()).nullable().optional(),
   error: external_exports.string().nullable().optional(),
-  effectiveProjectPath: external_exports.string().nullable().optional()
+  effectiveProjectPath: external_exports.string().nullable().optional(),
+  branch: external_exports.string().nullable().optional()
 });
 var AssignTaskBody = external_exports.object({
   nodeId: external_exports.string().min(1)
@@ -41636,7 +41681,7 @@ function readFileContent(root, relativePath) {
   };
 }
 
-// ../../packages/api/src/output/git-diff.ts
+// ../../packages/api/src/output/git-branches.ts
 var import_node_child_process4 = require("child_process");
 function git(args, cwd) {
   try {
@@ -41649,19 +41694,192 @@ function git(args, cwd) {
     return "";
   }
 }
+function gitSucceeds(args, cwd) {
+  try {
+    (0, import_node_child_process4.execFileSync)("git", ["-C", cwd, ...args], {
+      encoding: "utf-8",
+      timeout: 1e4,
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function runGit(args, cwd) {
+  return (0, import_node_child_process4.execFileSync)("git", ["-C", cwd, ...args], {
+    encoding: "utf-8",
+    timeout: 1e4,
+    stdio: ["pipe", "pipe", "pipe"]
+  }).trim();
+}
 function isGitRepo(dirPath) {
-  const result = git(["rev-parse", "--is-inside-work-tree"], dirPath);
+  return git(["rev-parse", "--is-inside-work-tree"], dirPath) === "true";
+}
+function normalizeCurrentBranch(branch) {
+  if (!branch || branch === "HEAD") {
+    return null;
+  }
+  return branch;
+}
+function parseRemoteBranch(ref) {
+  const normalized = ref.trim();
+  if (!normalized || normalized.includes(" -> ")) {
+    return null;
+  }
+  const [remote, ...branchParts] = normalized.split("/");
+  if (remote !== "origin" && remote !== "upstream" || branchParts.length === 0) {
+    return null;
+  }
+  return {
+    name: normalized,
+    remote,
+    branch: branchParts.join("/"),
+    ref: normalized
+  };
+}
+function branchPriority(branch) {
+  const name2 = branch.branch.toLowerCase();
+  const mainScore = name2 === "main" ? 0 : name2 === "master" ? 1 : 2;
+  const remoteScore = branch.remote === "upstream" ? 0 : 1;
+  return [mainScore, remoteScore, branch.branch];
+}
+function compareRemoteBranches(left, right) {
+  const [leftMain, leftRemote, leftName] = branchPriority(left);
+  const [rightMain, rightRemote, rightName] = branchPriority(right);
+  if (leftMain !== rightMain) {
+    return leftMain - rightMain;
+  }
+  if (leftRemote !== rightRemote) {
+    return leftRemote - rightRemote;
+  }
+  const branchCompare = leftName.localeCompare(rightName);
+  if (branchCompare !== 0) {
+    return branchCompare;
+  }
+  return left.remote.localeCompare(right.remote);
+}
+function listRemoteBranches(repoRoot2) {
+  const output = git([
+    "for-each-ref",
+    "--format=%(refname:short)",
+    "refs/remotes/origin",
+    "refs/remotes/upstream"
+  ], repoRoot2);
+  if (!output) {
+    return [];
+  }
+  return output.split("\n").map(parseRemoteBranch).filter((value) => value !== null).sort(compareRemoteBranches);
+}
+function getRemoteStartPoint(repoRoot2, value) {
+  const trimmed = value.trim();
+  if (!trimmed) {
+    throw new Error("A base branch is required");
+  }
+  const directRemote = parseRemoteBranch(trimmed);
+  if (directRemote) {
+    if (!gitSucceeds(["show-ref", "--verify", "--quiet", `refs/remotes/${directRemote.ref}`], repoRoot2)) {
+      throw new Error(`Remote branch ${directRemote.ref} not found`);
+    }
+    return { ref: directRemote.ref, track: true };
+  }
+  for (const remote of ["upstream", "origin"]) {
+    const remoteRef = `${remote}/${trimmed}`;
+    if (gitSucceeds(["show-ref", "--verify", "--quiet", `refs/remotes/${remoteRef}`], repoRoot2)) {
+      return { ref: remoteRef, track: true };
+    }
+  }
+  if (gitSucceeds(["show-ref", "--verify", "--quiet", `refs/heads/${trimmed}`], repoRoot2)) {
+    return { ref: trimmed, track: false };
+  }
+  throw new Error(`Branch ${trimmed} not found on upstream/origin or locally`);
+}
+function getGitBranchInfo(dirPath, options) {
+  const limit = Math.max(1, Math.min(20, Math.trunc(options.limit)));
+  const offset = Math.max(0, Math.trunc(options.offset));
+  if (!isGitRepo(dirPath)) {
+    return {
+      available: false,
+      repoRoot: null,
+      currentBranch: null,
+      branches: [],
+      limit,
+      offset,
+      total: 0,
+      hasMore: false
+    };
+  }
+  const repoRoot2 = git(["rev-parse", "--show-toplevel"], dirPath);
+  const currentBranch = normalizeCurrentBranch(git(["rev-parse", "--abbrev-ref", "HEAD"], dirPath));
+  const remoteBranches = listRemoteBranches(repoRoot2);
+  const branches = remoteBranches.slice(offset, offset + limit);
+  return {
+    available: true,
+    repoRoot: repoRoot2,
+    currentBranch,
+    branches,
+    limit,
+    offset,
+    total: remoteBranches.length,
+    hasMore: offset + branches.length < remoteBranches.length
+  };
+}
+function createGitBranch(dirPath, branchName, startPoint, options) {
+  if (!isGitRepo(dirPath)) {
+    throw new Error("Selected working directory is not inside a git repository");
+  }
+  const repoRoot2 = git(["rev-parse", "--show-toplevel"], dirPath);
+  const name2 = branchName.trim();
+  if (!name2) {
+    throw new Error("A new branch name is required");
+  }
+  try {
+    runGit(["check-ref-format", "--branch", name2], repoRoot2);
+  } catch {
+    throw new Error(`Invalid branch name: ${name2}`);
+  }
+  if (gitSucceeds(["show-ref", "--verify", "--quiet", `refs/heads/${name2}`], repoRoot2)) {
+    throw new Error(`Local branch ${name2} already exists`);
+  }
+  const target = getRemoteStartPoint(repoRoot2, startPoint);
+  if (target.track) {
+    runGit(["switch", "-c", name2, "--track", target.ref], repoRoot2);
+  } else {
+    runGit(["switch", "-c", name2, target.ref], repoRoot2);
+  }
+  return {
+    createdBranch: name2,
+    ...getGitBranchInfo(dirPath, options),
+    currentBranch: name2
+  };
+}
+
+// ../../packages/api/src/output/git-diff.ts
+var import_node_child_process5 = require("child_process");
+function git2(args, cwd) {
+  try {
+    return (0, import_node_child_process5.execFileSync)("git", ["-C", cwd, ...args], {
+      encoding: "utf-8",
+      timeout: 1e4,
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+  } catch {
+    return "";
+  }
+}
+function isGitRepo2(dirPath) {
+  const result = git2(["rev-parse", "--is-inside-work-tree"], dirPath);
   return result === "true";
 }
 function getGitDiff(dirPath) {
-  if (!isGitRepo(dirPath)) {
+  if (!isGitRepo2(dirPath)) {
     return { available: false };
   }
-  const repoRoot2 = git(["rev-parse", "--show-toplevel"], dirPath);
-  const branch = git(["rev-parse", "--abbrev-ref", "HEAD"], dirPath) || null;
-  const staged = git(["diff", "--cached"], dirPath);
-  const unstaged = git(["diff"], dirPath);
-  const statusOutput = git(["status", "--porcelain"], dirPath);
+  const repoRoot2 = git2(["rev-parse", "--show-toplevel"], dirPath);
+  const branch = git2(["rev-parse", "--abbrev-ref", "HEAD"], dirPath) || null;
+  const staged = git2(["diff", "--cached"], dirPath);
+  const unstaged = git2(["diff"], dirPath);
+  const statusOutput = git2(["status", "--porcelain"], dirPath);
   const changedFiles = [];
   const untrackedFiles = [];
   for (const line of statusOutput.split("\n")) {
@@ -41689,20 +41907,33 @@ function getGitDiff(dirPath) {
 function isAbsolutePath(p) {
   return path12.isAbsolute(p) || /^[A-Za-z]:[\\/]/.test(p);
 }
-function getLocalNodeWorkDirTree(nodeId, rootPath, currentPath, options) {
+function resolveNodeWorkDirTarget(nodeId, rootPath, currentPath, allowAbsolute) {
   if (!rootPath) {
     throw new MeshyError("VALIDATION_ERROR", `Node ${nodeId} does not expose a working directory`, 400);
   }
-  const useAbsolute = options.allowAbsolute && isAbsolutePath(currentPath);
+  const useAbsolute = allowAbsolute && isAbsolutePath(currentPath);
   const resolvedPath = useAbsolute ? path12.resolve(currentPath) : currentPath;
+  return {
+    rootPath,
+    resolvedPath,
+    useAbsolute
+  };
+}
+function getLocalNodeWorkDirTree(nodeId, rootPath, currentPath, options) {
+  const { rootPath: resolvedRootPath, resolvedPath, useAbsolute } = resolveNodeWorkDirTarget(
+    nodeId,
+    rootPath,
+    currentPath,
+    options.allowAbsolute
+  );
   try {
-    const entries = useAbsolute ? listAbsoluteDirectory(resolvedPath) : listDirectory(rootPath, resolvedPath);
+    const entries = useAbsolute ? listAbsoluteDirectory(resolvedPath) : listDirectory(resolvedRootPath, resolvedPath);
     const visibleEntries = options.directoriesOnly ? entries.filter((entry) => entry.type === "directory") : entries;
     const pagedEntries = visibleEntries.slice(options.offset, options.offset + options.limit);
-    const parentPath = computeParentPath(rootPath, resolvedPath, useAbsolute);
+    const parentPath = computeParentPath(resolvedRootPath, resolvedPath, useAbsolute);
     return {
       nodeId,
-      rootPath,
+      rootPath: resolvedRootPath,
       currentPath: resolvedPath,
       entries: pagedEntries,
       limit: options.limit,
@@ -41720,6 +41951,50 @@ function getLocalNodeWorkDirTree(nodeId, rootPath, currentPath, options) {
     throw err;
   }
 }
+function getLocalNodeWorkDirBranchInfo(nodeId, rootPath, currentPath, options) {
+  const { resolvedPath } = resolveNodeWorkDirTarget(
+    nodeId,
+    rootPath,
+    currentPath,
+    options.allowAbsolute
+  );
+  const branchInfo = getGitBranchInfo(resolvedPath, {
+    limit: options.limit,
+    offset: options.offset
+  });
+  return {
+    nodeId,
+    path: resolvedPath,
+    ...branchInfo
+  };
+}
+function createLocalNodeWorkDirBranch(nodeId, rootPath, currentPath, options) {
+  const { resolvedPath } = resolveNodeWorkDirTarget(
+    nodeId,
+    rootPath,
+    currentPath,
+    options.allowAbsolute
+  );
+  try {
+    const result = createGitBranch(
+      resolvedPath,
+      options.branchName,
+      options.startPoint,
+      { limit: options.limit, offset: options.offset }
+    );
+    return {
+      nodeId,
+      path: resolvedPath,
+      ...result
+    };
+  } catch (err) {
+    throw new MeshyError(
+      "VALIDATION_ERROR",
+      err instanceof Error ? err.message : String(err),
+      400
+    );
+  }
+}
 function computeParentPath(rootPath, currentPath, useAbsolute) {
   if (useAbsolute) {
     const parent = path12.dirname(currentPath);
@@ -41755,6 +42030,44 @@ function sendLocalNodeWorkDirTree(req, res, nodeId, options = {}) {
     }
   ));
 }
+function sendLocalNodeWorkDirBranchInfo(req, res, nodeId, options = {}) {
+  const query = NodeWorkDirBranchQuery.parse(req.query);
+  const { nodeRegistry, workDir } = req.app.locals.deps;
+  const self2 = nodeRegistry.getSelf();
+  if (options.requireSelfNode && nodeId !== self2.id) {
+    throw new MeshyError("NODE_NOT_FOUND", `Node ${nodeId} not found`, 404);
+  }
+  res.json(getLocalNodeWorkDirBranchInfo(
+    self2.id,
+    self2.workDir ?? workDir,
+    query.path,
+    {
+      limit: query.limit,
+      offset: query.offset,
+      allowAbsolute: query.allowAbsolute
+    }
+  ));
+}
+function sendLocalNodeWorkDirBranchCreate(req, res, nodeId, options = {}) {
+  const body = CreateNodeWorkDirBranchBody.parse(req.body);
+  const { nodeRegistry, workDir } = req.app.locals.deps;
+  const self2 = nodeRegistry.getSelf();
+  if (options.requireSelfNode && nodeId !== self2.id) {
+    throw new MeshyError("NODE_NOT_FOUND", `Node ${nodeId} not found`, 404);
+  }
+  res.json(createLocalNodeWorkDirBranch(
+    self2.id,
+    self2.workDir ?? workDir,
+    body.path,
+    {
+      branchName: body.branchName,
+      startPoint: body.startPoint,
+      limit: body.limit,
+      offset: body.offset,
+      allowAbsolute: body.allowAbsolute
+    }
+  ));
+}
 
 // ../../packages/api/src/task-route-utils.ts
 var fs11 = __toESM(require("fs"), 1);
@@ -42287,6 +42600,44 @@ async function executeWorkerControlRequest(deps, request) {
         );
         break;
       }
+      case "node-workdir-branch-info": {
+        const self2 = deps.nodeRegistry.getSelf();
+        response = jsonResponse(
+          request.requestId,
+          200,
+          getLocalNodeWorkDirBranchInfo(
+            self2.id,
+            self2.workDir ?? deps.workDir,
+            request.path ?? ".",
+            {
+              limit: request.limit ?? 20,
+              offset: request.offset ?? 0,
+              allowAbsolute: request.allowAbsolute ?? true
+            }
+          )
+        );
+        break;
+      }
+      case "node-workdir-branch-create": {
+        const self2 = deps.nodeRegistry.getSelf();
+        response = jsonResponse(
+          request.requestId,
+          200,
+          createLocalNodeWorkDirBranch(
+            self2.id,
+            self2.workDir ?? deps.workDir,
+            request.path ?? ".",
+            {
+              branchName: request.branchName ?? "",
+              startPoint: request.startPoint ?? "",
+              limit: request.limit ?? 20,
+              offset: request.offset ?? 0,
+              allowAbsolute: request.allowAbsolute ?? true
+            }
+          )
+        );
+        break;
+      }
       case "devtunnel": {
         assertCanChangeNodeDevTunnel(deps.taskEngine, deps.nodeRegistry.getSelf().id);
         if (request.enabled) {
@@ -42551,6 +42902,148 @@ async function maybeHandleRemoteNodeWorkDirRequest(req, res, nodeId) {
     throw new MeshyError("NODE_OFFLINE", `Cannot reach node ${nodeId} to browse its working directory`, 502);
   }
 }
+async function maybeHandleRemoteNodeWorkDirBranchInfoRequest(req, res, nodeId) {
+  const query = NodeWorkDirBranchQuery.parse(req.query);
+  const { nodeRegistry, heartbeat, logger: rootLogger } = req.app.locals.deps;
+  const selfId = nodeRegistry.getSelf().id;
+  if (nodeId === selfId) {
+    return false;
+  }
+  const node = nodeRegistry.getNode(nodeId);
+  if (!node) {
+    throw new MeshyError("NODE_NOT_FOUND", `Node ${nodeId} not found`, 404);
+  }
+  const log2 = rootLogger.child("nodes/workdir-branch");
+  const proxyPath = req.originalUrl ?? `/api/nodes/${nodeId}/workdir/branch`;
+  const fallbackRequest = {
+    kind: "node-workdir-branch-info",
+    path: query.path,
+    limit: query.limit,
+    offset: query.offset,
+    allowAbsolute: query.allowAbsolute
+  };
+  const canPushToNode = heartbeat?.canPushToNode?.(nodeId) ?? true;
+  if (!canPushToNode && heartbeat?.requestWorkerControl) {
+    log2.warn("node workdir branch request falling back to keepalive control", {
+      nodeId,
+      proxyPath
+    });
+    const controlResponse = await heartbeat.requestWorkerControl(nodeId, fallbackRequest);
+    sendWorkerControlResponse(res, controlResponse);
+    return true;
+  }
+  try {
+    const { endpoint, response } = await fetchNodeWithFallback(
+      node,
+      proxyPath,
+      void 0,
+      NODE_WORKDIR_PROXY_TIMEOUT_MS,
+      createNodeWorkdirProxyTrace(log2, nodeId, proxyPath),
+      { preferPublicEndpoint: true }
+    );
+    log2.debug("proxying node workdir branch request", {
+      nodeId,
+      endpoint,
+      proxyPath
+    });
+    await sendProxyResponse(res, response);
+    return true;
+  } catch (err) {
+    const errorDetails = describeProxyError(err);
+    log2.warn("node workdir branch proxy error", {
+      nodeId,
+      proxyPath,
+      timeoutMs: NODE_WORKDIR_PROXY_TIMEOUT_MS,
+      ...errorDetails
+    });
+    if (heartbeat?.requestWorkerControl) {
+      log2.warn("node workdir branch proxy failed, falling back to keepalive control", {
+        nodeId,
+        proxyPath,
+        timeoutMs: NODE_WORKDIR_PROXY_TIMEOUT_MS,
+        ...errorDetails
+      });
+      const controlResponse = await heartbeat.requestWorkerControl(nodeId, fallbackRequest);
+      sendWorkerControlResponse(res, controlResponse);
+      return true;
+    }
+    throw new MeshyError("NODE_OFFLINE", `Cannot reach node ${nodeId} to inspect its git branch`, 502);
+  }
+}
+async function maybeHandleRemoteNodeWorkDirBranchCreateRequest(req, res, nodeId) {
+  const body = CreateNodeWorkDirBranchBody.parse(req.body);
+  const { nodeRegistry, heartbeat, logger: rootLogger } = req.app.locals.deps;
+  const selfId = nodeRegistry.getSelf().id;
+  if (nodeId === selfId) {
+    return false;
+  }
+  const node = nodeRegistry.getNode(nodeId);
+  if (!node) {
+    throw new MeshyError("NODE_NOT_FOUND", `Node ${nodeId} not found`, 404);
+  }
+  const log2 = rootLogger.child("nodes/workdir-branch-create");
+  const proxyPath = req.originalUrl ?? `/api/nodes/${nodeId}/workdir/branch`;
+  const fallbackRequest = {
+    kind: "node-workdir-branch-create",
+    path: body.path,
+    branchName: body.branchName,
+    startPoint: body.startPoint,
+    limit: body.limit,
+    offset: body.offset,
+    allowAbsolute: body.allowAbsolute
+  };
+  const canPushToNode = heartbeat?.canPushToNode?.(nodeId) ?? true;
+  if (!canPushToNode && heartbeat?.requestWorkerControl) {
+    log2.warn("node workdir branch create request falling back to keepalive control", {
+      nodeId,
+      proxyPath
+    });
+    const controlResponse = await heartbeat.requestWorkerControl(nodeId, fallbackRequest);
+    sendWorkerControlResponse(res, controlResponse);
+    return true;
+  }
+  try {
+    const { endpoint, response } = await fetchNodeWithFallback(
+      node,
+      proxyPath,
+      {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(body)
+      },
+      NODE_WORKDIR_PROXY_TIMEOUT_MS,
+      createNodeWorkdirProxyTrace(log2, nodeId, proxyPath),
+      { preferPublicEndpoint: true }
+    );
+    log2.debug("proxying node workdir branch create request", {
+      nodeId,
+      endpoint,
+      proxyPath
+    });
+    await sendProxyResponse(res, response);
+    return true;
+  } catch (err) {
+    const errorDetails = describeProxyError(err);
+    log2.warn("node workdir branch create proxy error", {
+      nodeId,
+      proxyPath,
+      timeoutMs: NODE_WORKDIR_PROXY_TIMEOUT_MS,
+      ...errorDetails
+    });
+    if (heartbeat?.requestWorkerControl) {
+      log2.warn("node workdir branch create proxy failed, falling back to keepalive control", {
+        nodeId,
+        proxyPath,
+        timeoutMs: NODE_WORKDIR_PROXY_TIMEOUT_MS,
+        ...errorDetails
+      });
+      const controlResponse = await heartbeat.requestWorkerControl(nodeId, fallbackRequest);
+      sendWorkerControlResponse(res, controlResponse);
+      return true;
+    }
+    throw new MeshyError("NODE_OFFLINE", `Cannot reach node ${nodeId} to create a git branch`, 502);
+  }
+}
 function createNodeRoutes() {
   const router = (0, import_express3.Router)();
   router.get("/", asyncHandler2(async (req, res) => {
@@ -42598,6 +43091,22 @@ function createNodeRoutes() {
     }
     sendLocalNodeWorkDirTree(req, res, nodeId);
   }));
+  router.get("/:id/workdir/branch", asyncHandler2(async (req, res) => {
+    const nodeId = req.params.id;
+    const handled = await maybeHandleRemoteNodeWorkDirBranchInfoRequest(req, res, nodeId);
+    if (handled) {
+      return;
+    }
+    sendLocalNodeWorkDirBranchInfo(req, res, nodeId);
+  }));
+  router.post("/:id/workdir/branch", asyncHandler2(async (req, res) => {
+    const nodeId = req.params.id;
+    const handled = await maybeHandleRemoteNodeWorkDirBranchCreateRequest(req, res, nodeId);
+    if (handled) {
+      return;
+    }
+    sendLocalNodeWorkDirBranchCreate(req, res, nodeId);
+  }));
   router.patch("/:id", asyncHandler2(async (req, res) => {
     const { nodeRegistry, persistNodeNamePreference } = req.app.locals.deps;
     const updates = UpdateNodeBody.parse(req.body);
@@ -43089,6 +43598,7 @@ function createTaskRoutes() {
       description: body.description ?? "",
       agent: body.agent,
       project: body.project ?? null,
+      branch: body.branch ?? null,
       payload: body.payload ?? {},
       priority: body.priority,
       createdBy: "api"
@@ -43430,10 +43940,11 @@ function createWorkerRoutes() {
     const task = req.body;
     const effectiveWorkDir = workDir ?? nodeRegistry.getSelf().workDir ?? process.cwd();
     task.effectiveProjectPath = resolveTaskWorkDir(task.project, effectiveWorkDir);
+    task.branch = getGitBranchInfo(task.effectiveProjectPath, { limit: 20, offset: 0 }).currentBranch;
     await taskEngine.executeTask(task);
     res.json({ ok: true });
     if (!nodeRegistry.isLeader()) {
-      forwardRunningStatusToLeader(log2, nodeRegistry, task.id, task.effectiveProjectPath);
+      forwardRunningStatusToLeader(log2, nodeRegistry, task.id, task.effectiveProjectPath, task.branch);
     }
     const engine = engineRegistry.get(task.agent);
     if (engine) {
@@ -43515,7 +44026,7 @@ function createWorkerRoutes() {
     }
     taskEngine.updateTask(body.taskId, { status: "running" });
     if (!nodeRegistry.isLeader()) {
-      forwardRunningStatusToLeader(log2, nodeRegistry, body.taskId);
+      forwardRunningStatusToLeader(log2, nodeRegistry, body.taskId, void 0, task.branch);
     }
     let cleanupForwarding = null;
     if (!nodeRegistry.isLeader()) {
@@ -43670,7 +44181,7 @@ var import_express7 = __toESM(require_express2(), 1);
 
 // ../../packages/api/src/system-info.ts
 var os5 = __toESM(require("os"), 1);
-var import_node_child_process5 = require("child_process");
+var import_node_child_process6 = require("child_process");
 var RUNTIME_TOOLS = [
   { id: "claude", label: "Claude Code", command: "claude" },
   { id: "codex", label: "Codex", command: "codex" }
@@ -43684,7 +44195,7 @@ function normalizeOutput(output) {
 }
 function resolveCommandPath(command) {
   const lookupCommand = process.platform === "win32" ? "where" : "which";
-  const result = (0, import_node_child_process5.spawnSync)(lookupCommand, [command], {
+  const result = (0, import_node_child_process6.spawnSync)(lookupCommand, [command], {
     encoding: "utf-8",
     shell: false,
     windowsHide: true,
@@ -43713,7 +44224,7 @@ function inspectTool(definition) {
       detail: resolved.detail ?? "Command not found on PATH"
     };
   }
-  const versionResult = (0, import_node_child_process5.spawnSync)(definition.command, ["--version"], {
+  const versionResult = (0, import_node_child_process6.spawnSync)(definition.command, ["--version"], {
     encoding: "utf-8",
     shell: process.platform === "win32",
     windowsHide: true,
@@ -44159,10 +44670,10 @@ var DirectTransport = class {
 };
 
 // ../../packages/transport/src/devtunnel.ts
-var import_node_child_process6 = require("child_process");
+var import_node_child_process7 = require("child_process");
 function isInstalled(cmd) {
   try {
-    (0, import_node_child_process6.execSync)(process.platform === "win32" ? `where ${cmd}` : `command -v ${cmd}`, { stdio: "pipe" });
+    (0, import_node_child_process7.execSync)(process.platform === "win32" ? `where ${cmd}` : `command -v ${cmd}`, { stdio: "pipe" });
     return true;
   } catch {
     return false;
@@ -44185,14 +44696,14 @@ var DevTunnelTransport = class {
       );
     }
     try {
-      (0, import_node_child_process6.execSync)("devtunnel user show", { stdio: "pipe" });
+      (0, import_node_child_process7.execSync)("devtunnel user show", { stdio: "pipe" });
     } catch {
       throw new Error(
         "Not logged in to devtunnel. Run: devtunnel user login"
       );
     }
     const hostArgs = this.buildHostArgs(localPort);
-    const child = (0, import_node_child_process6.spawn)("devtunnel", hostArgs, {
+    const child = (0, import_node_child_process7.spawn)("devtunnel", hostArgs, {
       stdio: ["pipe", "pipe", "pipe"]
     });
     this.process = child;
@@ -44297,7 +44808,7 @@ ${lines.join("")}`
       return void 0;
     }
     try {
-      (0, import_node_child_process6.execFileSync)("devtunnel", ["show", tunnelId], { stdio: "pipe" });
+      (0, import_node_child_process7.execFileSync)("devtunnel", ["show", tunnelId], { stdio: "pipe" });
       return tunnelId;
     } catch {
       const createArgs = ["create", tunnelId];
@@ -44305,7 +44816,7 @@ ${lines.join("")}`
         createArgs.push("-a");
       }
       try {
-        (0, import_node_child_process6.execFileSync)("devtunnel", createArgs, { stdio: "pipe" });
+        (0, import_node_child_process7.execFileSync)("devtunnel", createArgs, { stdio: "pipe" });
         return tunnelId;
       } catch (err) {
         throw new Error(
@@ -44320,7 +44831,7 @@ ${lines.join("")}`
       return;
     }
     try {
-      (0, import_node_child_process6.execFileSync)(
+      (0, import_node_child_process7.execFileSync)(
         "devtunnel",
         ["port", "create", tunnelId, "-p", String(localPort), "--protocol", "http"],
         { stdio: "pipe" }
@@ -44336,7 +44847,7 @@ ${lines.join("")}`
   }
   listTunnelPorts(tunnelId) {
     try {
-      const output = (0, import_node_child_process6.execFileSync)("devtunnel", ["port", "list", tunnelId, "-j"], { stdio: "pipe" });
+      const output = (0, import_node_child_process7.execFileSync)("devtunnel", ["port", "list", tunnelId, "-j"], { stdio: "pipe" });
       const parsed = JSON.parse(output.toString());
       const items = Array.isArray(parsed) ? parsed : parsed && typeof parsed === "object" && Array.isArray(parsed.ports) ? parsed.ports : parsed && typeof parsed === "object" && Array.isArray(parsed.value) ? parsed.value : [];
       return items.map((item) => getPortNumber(item)).filter((value) => value !== void 0);
@@ -44348,7 +44859,7 @@ ${lines.join("")}`
   }
   hasTunnelPort(tunnelId, localPort) {
     try {
-      (0, import_node_child_process6.execFileSync)(
+      (0, import_node_child_process7.execFileSync)(
         "devtunnel",
         ["port", "show", tunnelId, "-p", String(localPort), "-j"],
         { stdio: "pipe" }
@@ -44363,8 +44874,27 @@ ${lines.join("")}`
   }
 };
 function parsePublicUrl(output) {
-  const match = output.match(/https?:\/\/[^\s"',]+/);
-  return match ? match[0] : null;
+  const matches = output.matchAll(/https?:\/\/[^\s"',]+/g);
+  for (const match of matches) {
+    const url = normalizeDevTunnelUrl(match[0]);
+    if (url) {
+      return url;
+    }
+  }
+  return null;
+}
+function normalizeDevTunnelUrl(value) {
+  const candidate = value.replace(/[),.;\]}]+$/, "");
+  try {
+    const url = new URL(candidate);
+    const hostname3 = url.hostname.toLowerCase().replace(/\.$/, "");
+    if (hostname3 !== "devtunnels.ms" && !hostname3.endsWith(".devtunnels.ms")) {
+      return null;
+    }
+    return url.origin;
+  } catch {
+    return null;
+  }
 }
 function formatCommandError(error) {
   if (!error || typeof error !== "object") {
@@ -44406,7 +44936,7 @@ function createTransport(config) {
 var fs15 = __toESM(require("fs"), 1);
 var path16 = __toESM(require("path"), 1);
 var readline = __toESM(require("readline/promises"), 1);
-var import_node_child_process7 = require("child_process");
+var import_node_child_process8 = require("child_process");
 function getDefaultNodeName() {
   return getDeviceNodeName();
 }
@@ -44453,7 +44983,7 @@ function createPromptSession(prompt) {
 }
 function createDefaultCommandRunner(platform2) {
   return (command, args, interactive = false) => {
-    const result = (0, import_node_child_process7.spawnSync)(command, args, {
+    const result = (0, import_node_child_process8.spawnSync)(command, args, {
       encoding: "utf-8",
       shell: platform2 === "win32",
       stdio: interactive ? "inherit" : "pipe"
@@ -44894,7 +45424,7 @@ function formatLoadedStartMetadata(info, authEnabled) {
 // src/runtime-metadata.ts
 var fs16 = __toESM(require("fs"), 1);
 var path17 = __toESM(require("path"), 1);
-var import_node_child_process8 = require("child_process");
+var import_node_child_process9 = require("child_process");
 var runtimeDir = resolveRuntimeDir();
 var appRoot = resolveAppRoot(runtimeDir);
 var repoRoot = path17.resolve(appRoot, "../..");
@@ -44989,7 +45519,7 @@ function readRepositoryUrlFromManifest(manifest) {
 }
 function readGitValue(args) {
   try {
-    const output = (0, import_node_child_process8.execFileSync)("git", args, {
+    const output = (0, import_node_child_process9.execFileSync)("git", args, {
       cwd: repoRoot,
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "ignore"],