techunter 1.1.1 → 1.1.3

package/dist/index.cjs

@@ -60494,6 +60494,38 @@ async function abortMergeOperation() {
   } catch {
   }
 }
+async function countCommits(range) {
+  const count = await git.raw(["rev-list", "--count", range]);
+  return parseInt(count.trim(), 10);
+}
+async function syncBranchWithRemote(branchName) {
+  try {
+    await git.fetch("origin", branchName);
+  } catch {
+    return { mode: "noop" };
+  }
+  const remoteRef = `origin/${branchName}`;
+  const branches = await git.branch(["-a"]);
+  if (!Object.prototype.hasOwnProperty.call(branches.branches, `remotes/${remoteRef}`)) {
+    return { mode: "noop" };
+  }
+  const [localAhead, remoteAhead] = await Promise.all([
+    countCommits(`${remoteRef}..${branchName}`),
+    countCommits(`${branchName}..${remoteRef}`)
+  ]);
+  if (remoteAhead === 0) return { mode: "noop" };
+  if (localAhead === 0) {
+    await git.merge(["--ff-only", remoteRef]);
+    return { mode: "fast-forward" };
+  }
+  try {
+    await git.merge([remoteRef, "-m", `chore: sync ${branchName} after remote update`]);
+    return { mode: "merge" };
+  } catch (err) {
+    await abortMergeOperation();
+    throw new Error(`Could not sync ${branchName} with ${remoteRef}: ${err.message}`);
+  }
+}
 async function getDiffFromCommit(baseCommit) {
   const status = await git.status();
   const parts = [];
@@ -60580,6 +60612,7 @@ async function stageAllAndCommit(message) {
     console.log(source_default.dim("  Working tree clean \u2014 no new commit created, pushing existing commits."));
   }
   const branch = (await git.branch()).current;
+  await syncBranchWithRemote(branch);
   await git.push("origin", branch, ["--set-upstream"]);
 }
 async function getRemoteHeadSha(baseBranch) {
@@ -147272,7 +147305,7 @@ async function chooseTaskForSubmit(config, username, currentIssueNumber) {
   }
   return ordered.find((task) => task.number === issueNumber) ?? null;
 }
-async function prepareTaskContext(config, issue, username, currentBranch, interactive, carryCurrentWork) {
+async function prepareTaskContext(config, issue, username, currentBranch, interactive, carryCurrentWork, previousTaskState) {
   const targetBranch = getTaskBranch2(issue, username);
   if (currentBranch === targetBranch) {
     await setActiveTaskState(issue, targetBranch);
@@ -147315,6 +147348,7 @@ async function prepareTaskContext(config, issue, username, currentBranch, intera
     }
   }
   const notices = [];
+  const shouldRestoreOriginalContext = action === "switch";
   let stashed = false;
   let switched = false;
   let switchedBranch = targetBranch;
@@ -147337,11 +147371,17 @@ async function prepareTaskContext(config, issue, username, currentBranch, intera
       stashRestoredOnTarget = true;
       notices.push(`Restored your unsaved work on ${switchedBranch}.`);
     } else if (stashed) {
-      notices.push(
-        `Saved your unsaved work from ${currentBranch}. Return there later and run \`git stash pop\` to restore it.`
-      );
+      notices.push(`Saved your unsaved work from ${currentBranch} while preparing #${issue.number}.`);
     }
-    return { branch: switchedBranch, notices };
+    return {
+      branch: switchedBranch,
+      notices,
+      restore: shouldRestoreOriginalContext ? {
+        originalBranch: currentBranch,
+        restoreStash: stashed && !stashRestoredOnTarget,
+        previousTaskState: previousTaskState?.activeBranch === currentBranch ? previousTaskState : void 0
+      } : void 0
+    };
   } catch (err) {
     const rollbackNotices = [];
     if (mergeAttempted) {
@@ -147372,6 +147412,48 @@ ${rollbackNotices.join("\n")}` : "";
     throw new Error(`Could not prepare task #${issue.number}: ${err.message}${details}`);
   }
 }
+async function restorePreviousContext(context) {
+  const notices = [];
+  try {
+    await switchToBranchOrCreate(context.originalBranch);
+    notices.push(`Returned to ${context.originalBranch}.`);
+  } catch (err) {
+    notices.push(`Could not return to ${context.originalBranch} automatically: ${err.message}`);
+    if (context.restoreStash) {
+      notices.push("Your stashed work was kept unchanged.");
+    }
+    return notices;
+  }
+  try {
+    const syncResult = await syncBranchWithRemote(context.originalBranch);
+    if (syncResult.mode === "fast-forward") {
+      notices.push(`Fast-forwarded ${context.originalBranch} to the latest origin/${context.originalBranch}.`);
+    } else if (syncResult.mode === "merge") {
+      notices.push(`Merged the latest origin/${context.originalBranch} into ${context.originalBranch} before restoring your work.`);
+    }
+  } catch (err) {
+    notices.push(`Could not sync ${context.originalBranch} with origin/${context.originalBranch}: ${err.message}`);
+    if (context.restoreStash) {
+      notices.push("Your stashed work was not restored because the branch needs manual sync first.");
+    }
+    if (context.previousTaskState) {
+      setConfig({ taskState: context.previousTaskState });
+    }
+    return notices;
+  }
+  if (context.restoreStash) {
+    try {
+      await stashPop();
+      notices.push(`Restored your stashed work on ${context.originalBranch}.`);
+    } catch (err) {
+      notices.push(`Could not restore your stashed work automatically on ${context.originalBranch}: ${err.message}`);
+    }
+  }
+  if (context.previousTaskState) {
+    setConfig({ taskState: context.previousTaskState });
+  }
+  return notices;
+}
 async function buildDiffForIssue(issue, branch) {
   const taskState = getConfig().taskState;
   if (taskState?.activeIssueNumber === issue.number && taskState?.activeBranch === branch && taskState.baseCommit) {
@@ -147392,8 +147474,11 @@ async function performSubmit(config, issue, branch, username, interactive, commi
   const openSubtaskNumbers = await getOpenSubtasks(config, branch);
   spinner?.stop();
   if (openSubtaskNumbers.length > 0) {
-    return interactive ? `Cannot submit: ${openSubtaskNumbers.length} sub-task(s) still open:
-` + openSubtaskNumbers.map((n2) => `  - #${n2}`).join("\n") + "\nComplete all sub-tasks before submitting." : `Cannot submit: ${openSubtaskNumbers.length} sub-task(s) still open: ` + openSubtaskNumbers.map((n2) => `#${n2}`).join(", ");
+    return {
+      message: interactive ? `Cannot submit: ${openSubtaskNumbers.length} sub-task(s) still open:
+` + openSubtaskNumbers.map((n2) => `  - #${n2}`).join("\n") + "\nComplete all sub-tasks before submitting." : `Cannot submit: ${openSubtaskNumbers.length} sub-task(s) still open: ` + openSubtaskNumbers.map((n2) => `#${n2}`).join(", "),
+      success: false
+    };
   }
   let review = "";
   if (!isSelfSubmit) {
@@ -147426,9 +147511,9 @@ async function performSubmit(config, issue, branch, username, interactive, commi
         ]
       });
     } catch {
-      return "Submit cancelled.";
+      return { message: "Submit cancelled.", success: false };
     }
-    if (!shouldProceed) return "Submit cancelled by user.";
+    if (!shouldProceed) return { message: "Submit cancelled by user.", success: false };
   }
   let commitMessage = commitMessageOverride?.trim();
   if (!commitMessage) {
@@ -147439,9 +147524,9 @@ async function performSubmit(config, issue, branch, username, interactive, commi
           default: `complete: ${issue.title}`
         });
       } catch {
-        return "Submit cancelled.";
+        return { message: "Submit cancelled.", success: false };
       }
-      if (!commitMessage.trim()) return "Submit cancelled.";
+      if (!commitMessage.trim()) return { message: "Submit cancelled.", success: false };
     } else {
       commitMessage = `complete: ${issue.title}`;
     }
@@ -147452,7 +147537,7 @@ async function performSubmit(config, issue, branch, username, interactive, commi
     spinner?.stop();
   } catch (err) {
     spinner?.stop();
-    return `Commit failed: ${err.message}`;
+    return { message: `Push failed: ${err.message}`, success: false };
   }
   if (isSelfSubmit) {
     const baseBranch = config.baseBranch ?? "main";
@@ -147465,7 +147550,10 @@ async function performSubmit(config, issue, branch, username, interactive, commi
         spinner?.stop();
       } catch (err) {
         spinner?.stop();
-        return `Committed and pushed to ${branch}, but failed to merge into ${targetBranch}: ${err.message}`;
+        return {
+          message: `Committed and pushed to ${branch}, but failed to merge into ${targetBranch}: ${err.message}`,
+          success: false
+        };
       }
     }
     if (!isTaskBranch(targetBranch) && targetBranch !== baseBranch) {
@@ -147476,7 +147564,10 @@ async function performSubmit(config, issue, branch, username, interactive, commi
         spinner?.stop();
       } catch (err) {
         spinner?.stop();
-        return `Committed and merged ${branch} -> ${targetBranch}, but failed to merge ${targetBranch} into ${baseBranch}: ${err.message}`;
+        return {
+          message: `Committed and merged ${branch} -> ${targetBranch}, but failed to merge ${targetBranch} into ${baseBranch}: ${err.message}`,
+          success: false
+        };
       }
     }
     spinner = interactive ? ora("Closing issue...").start() : void 0;
@@ -147491,9 +147582,12 @@ async function performSubmit(config, issue, branch, username, interactive, commi
     }
     setConfig({ taskState: { activeIssueNumber: void 0, baseCommit: void 0, activeBranch: void 0 } });
     const mergePath = finalBranch === targetBranch ? `${branch} -> ${targetBranch}` : `${branch} -> ${targetBranch} -> ${finalBranch}`;
-    return `Task #${issue.number} committed and closed.
+    return {
+      message: `Task #${issue.number} committed and closed.
 Merged: ${mergePath}
-Commit: "${commitMessage.trim()}"`;
+Commit: "${commitMessage.trim()}"`,
+      success: true
+    };
   }
   spinner = interactive ? ora("Checking for existing PR...").start() : void 0;
   const existingPR = await getTaskPR(config, issue.number, branch);
@@ -147520,7 +147614,7 @@ ${review}` : ""
       spinner?.stop();
     } catch (err) {
       spinner?.stop();
-      return `Committed but PR creation failed: ${err.message}`;
+      return { message: `Committed but PR creation failed: ${err.message}`, success: false };
     }
   }
   spinner = interactive ? ora("Marking as in-review...").start() : void 0;
@@ -147529,16 +147623,22 @@ ${review}` : ""
     spinner?.stop();
   } catch (err) {
     spinner?.stop();
-    return interactive ? `PR ${existingPR ? "updated" : "created"} (${prUrl}) but failed to update label: ${err.message}` : `PR ${existingPR ? "updated" : "created"} (${prUrl}) but failed to update label: ${err.message}`;
+    return {
+      message: interactive ? `PR ${existingPR ? "updated" : "created"} (${prUrl}) but failed to update label: ${err.message}` : `PR ${existingPR ? "updated" : "created"} (${prUrl}) but failed to update label: ${err.message}`,
+      success: false
+    };
   }
   setConfig({ taskState: { activeIssueNumber: void 0, baseCommit: void 0, activeBranch: void 0 } });
-  return interactive ? `Task #${issue.number} ${existingPR ? "re-submitted" : "submitted"}.
+  return {
+    message: interactive ? `Task #${issue.number} ${existingPR ? "re-submitted" : "submitted"}.
 Commit: "${commitMessage.trim()}"
 PR: ${prUrl}` : `Task #${issue.number} ${existingPR ? "re-submitted" : "submitted"}.
 Review:
 ${review}
 Commit: "${commitMessage.trim()}"
-PR: ${prUrl}`;
+PR: ${prUrl}`,
+    success: true
+  };
 }
 function formatSubmitResult(result, notices) {
   if (notices.length === 0) return result;
@@ -147567,6 +147667,7 @@ var definition = {
 };
 async function run(_input, config) {
   const currentBranch = await getCurrentBranch();
+  const previousTaskState = getConfig().taskState;
   const [username, currentIssueNumber] = await Promise.all([
     getAuthenticatedUser(config),
     resolveIssueNumberFromBranch(config, currentBranch)
@@ -147582,18 +147683,27 @@ async function run(_input, config) {
   }
   let branch;
   let notices;
+  let restore;
   try {
-    ({ branch, notices } = await prepareTaskContext(config, selectedTask, username, currentBranch, true));
+    ({ branch, notices, restore } = await prepareTaskContext(
+      config,
+      selectedTask,
+      username,
+      currentBranch,
+      true,
+      void 0,
+      previousTaskState
+    ));
   } catch (err) {
     return err.message;
   }
-  return formatSubmitResult(
-    await performSubmit(config, selectedTask, branch, username, true),
-    notices
-  );
+  const outcome = await performSubmit(config, selectedTask, branch, username, true);
+  const allNotices = outcome.success && restore ? notices.concat(await restorePreviousContext(restore)) : notices;
+  return formatSubmitResult(outcome.message, allNotices);
 }
 async function execute(input, config) {
   const currentBranch = await getCurrentBranch();
+  const previousTaskState = getConfig().taskState;
   const username = await getAuthenticatedUser(config);
   const requestedIssueNumber = input["issue_number"];
   const carryCurrentWork = input["carry_current_work"];
@@ -147610,29 +147720,30 @@ async function execute(input, config) {
   }
   let branch;
   let notices;
+  let restore;
   try {
-    ({ branch, notices } = await prepareTaskContext(
+    ({ branch, notices, restore } = await prepareTaskContext(
       config,
       issue,
       username,
       currentBranch,
       false,
-      carryCurrentWork
+      carryCurrentWork,
+      previousTaskState
     ));
   } catch (err) {
     return err.message;
   }
-  return formatSubmitResult(
-    await performSubmit(
-      config,
-      issue,
-      branch,
-      username,
-      false,
-      input["commit_message"]
-    ),
-    notices
+  const outcome = await performSubmit(
+    config,
+    issue,
+    branch,
+    username,
+    false,
+    input["commit_message"]
   );
+  const allNotices = outcome.success && restore ? notices.concat(await restorePreviousContext(restore)) : notices;
+  return formatSubmitResult(outcome.message, allNotices);
 }
 var terminal2 = true;
 
@@ -150894,7 +151005,7 @@ async function startAutoUpdate(currentVersion) {
 }
 
 // src/index.ts
-var version = "1.1.1";
+var version = "1.1.3";
 var SLASH_NAMES = [
   "/help",
   "/h",

package/dist/mcp.cjs

@@ -56709,6 +56709,38 @@ async function abortMergeOperation() {
   } catch {
   }
 }
+async function countCommits(range) {
+  const count = await git.raw(["rev-list", "--count", range]);
+  return parseInt(count.trim(), 10);
+}
+async function syncBranchWithRemote(branchName) {
+  try {
+    await git.fetch("origin", branchName);
+  } catch {
+    return { mode: "noop" };
+  }
+  const remoteRef = `origin/${branchName}`;
+  const branches = await git.branch(["-a"]);
+  if (!Object.prototype.hasOwnProperty.call(branches.branches, `remotes/${remoteRef}`)) {
+    return { mode: "noop" };
+  }
+  const [localAhead, remoteAhead] = await Promise.all([
+    countCommits(`${remoteRef}..${branchName}`),
+    countCommits(`${branchName}..${remoteRef}`)
+  ]);
+  if (remoteAhead === 0) return { mode: "noop" };
+  if (localAhead === 0) {
+    await git.merge(["--ff-only", remoteRef]);
+    return { mode: "fast-forward" };
+  }
+  try {
+    await git.merge([remoteRef, "-m", `chore: sync ${branchName} after remote update`]);
+    return { mode: "merge" };
+  } catch (err) {
+    await abortMergeOperation();
+    throw new Error(`Could not sync ${branchName} with ${remoteRef}: ${err.message}`);
+  }
+}
 async function getDiffFromCommit(baseCommit) {
   const status = await git.status();
   const parts = [];
@@ -56795,6 +56827,7 @@ async function stageAllAndCommit(message) {
     console.log(source_default.dim("  Working tree clean \u2014 no new commit created, pushing existing commits."));
   }
   const branch = (await git.branch()).current;
+  await syncBranchWithRemote(branch);
   await git.push("origin", branch, ["--set-upstream"]);
 }
 async function getRemoteHeadSha(baseBranch) {
@@ -152018,7 +152051,7 @@ async function chooseTaskForSubmit(config2, username, currentIssueNumber) {
   }
   return ordered.find((task) => task.number === issueNumber) ?? null;
 }
-async function prepareTaskContext(config2, issue2, username, currentBranch, interactive, carryCurrentWork) {
+async function prepareTaskContext(config2, issue2, username, currentBranch, interactive, carryCurrentWork, previousTaskState) {
   const targetBranch = getTaskBranch2(issue2, username);
   if (currentBranch === targetBranch) {
     await setActiveTaskState(issue2, targetBranch);
@@ -152061,6 +152094,7 @@ async function prepareTaskContext(config2, issue2, username, currentBranch, inte
     }
   }
   const notices = [];
+  const shouldRestoreOriginalContext = action === "switch";
   let stashed = false;
   let switched = false;
   let switchedBranch = targetBranch;
@@ -152083,11 +152117,17 @@ async function prepareTaskContext(config2, issue2, username, currentBranch, inte
       stashRestoredOnTarget = true;
       notices.push(`Restored your unsaved work on ${switchedBranch}.`);
     } else if (stashed) {
-      notices.push(
-        `Saved your unsaved work from ${currentBranch}. Return there later and run \`git stash pop\` to restore it.`
-      );
+      notices.push(`Saved your unsaved work from ${currentBranch} while preparing #${issue2.number}.`);
     }
-    return { branch: switchedBranch, notices };
+    return {
+      branch: switchedBranch,
+      notices,
+      restore: shouldRestoreOriginalContext ? {
+        originalBranch: currentBranch,
+        restoreStash: stashed && !stashRestoredOnTarget,
+        previousTaskState: previousTaskState?.activeBranch === currentBranch ? previousTaskState : void 0
+      } : void 0
+    };
   } catch (err) {
     const rollbackNotices = [];
     if (mergeAttempted) {
@@ -152118,6 +152158,48 @@ ${rollbackNotices.join("\n")}` : "";
     throw new Error(`Could not prepare task #${issue2.number}: ${err.message}${details}`);
   }
 }
+async function restorePreviousContext(context) {
+  const notices = [];
+  try {
+    await switchToBranchOrCreate(context.originalBranch);
+    notices.push(`Returned to ${context.originalBranch}.`);
+  } catch (err) {
+    notices.push(`Could not return to ${context.originalBranch} automatically: ${err.message}`);
+    if (context.restoreStash) {
+      notices.push("Your stashed work was kept unchanged.");
+    }
+    return notices;
+  }
+  try {
+    const syncResult = await syncBranchWithRemote(context.originalBranch);
+    if (syncResult.mode === "fast-forward") {
+      notices.push(`Fast-forwarded ${context.originalBranch} to the latest origin/${context.originalBranch}.`);
+    } else if (syncResult.mode === "merge") {
+      notices.push(`Merged the latest origin/${context.originalBranch} into ${context.originalBranch} before restoring your work.`);
+    }
+  } catch (err) {
+    notices.push(`Could not sync ${context.originalBranch} with origin/${context.originalBranch}: ${err.message}`);
+    if (context.restoreStash) {
+      notices.push("Your stashed work was not restored because the branch needs manual sync first.");
+    }
+    if (context.previousTaskState) {
+      setConfig({ taskState: context.previousTaskState });
+    }
+    return notices;
+  }
+  if (context.restoreStash) {
+    try {
+      await stashPop();
+      notices.push(`Restored your stashed work on ${context.originalBranch}.`);
+    } catch (err) {
+      notices.push(`Could not restore your stashed work automatically on ${context.originalBranch}: ${err.message}`);
+    }
+  }
+  if (context.previousTaskState) {
+    setConfig({ taskState: context.previousTaskState });
+  }
+  return notices;
+}
 async function buildDiffForIssue(issue2, branch) {
   const taskState = getConfig().taskState;
   if (taskState?.activeIssueNumber === issue2.number && taskState?.activeBranch === branch && taskState.baseCommit) {
@@ -152138,8 +152220,11 @@ async function performSubmit(config2, issue2, branch, username, interactive, com
   const openSubtaskNumbers = await getOpenSubtasks(config2, branch);
   spinner?.stop();
   if (openSubtaskNumbers.length > 0) {
-    return interactive ? `Cannot submit: ${openSubtaskNumbers.length} sub-task(s) still open:
-` + openSubtaskNumbers.map((n2) => `  - #${n2}`).join("\n") + "\nComplete all sub-tasks before submitting." : `Cannot submit: ${openSubtaskNumbers.length} sub-task(s) still open: ` + openSubtaskNumbers.map((n2) => `#${n2}`).join(", ");
+    return {
+      message: interactive ? `Cannot submit: ${openSubtaskNumbers.length} sub-task(s) still open:
+` + openSubtaskNumbers.map((n2) => `  - #${n2}`).join("\n") + "\nComplete all sub-tasks before submitting." : `Cannot submit: ${openSubtaskNumbers.length} sub-task(s) still open: ` + openSubtaskNumbers.map((n2) => `#${n2}`).join(", "),
+      success: false
+    };
   }
   let review = "";
   if (!isSelfSubmit) {
@@ -152172,9 +152257,9 @@ async function performSubmit(config2, issue2, branch, username, interactive, com
         ]
       });
     } catch {
-      return "Submit cancelled.";
+      return { message: "Submit cancelled.", success: false };
     }
-    if (!shouldProceed) return "Submit cancelled by user.";
+    if (!shouldProceed) return { message: "Submit cancelled by user.", success: false };
   }
   let commitMessage = commitMessageOverride?.trim();
   if (!commitMessage) {
@@ -152185,9 +152270,9 @@ async function performSubmit(config2, issue2, branch, username, interactive, com
           default: `complete: ${issue2.title}`
         });
       } catch {
-        return "Submit cancelled.";
+        return { message: "Submit cancelled.", success: false };
       }
-      if (!commitMessage.trim()) return "Submit cancelled.";
+      if (!commitMessage.trim()) return { message: "Submit cancelled.", success: false };
     } else {
       commitMessage = `complete: ${issue2.title}`;
     }
@@ -152198,7 +152283,7 @@ async function performSubmit(config2, issue2, branch, username, interactive, com
     spinner?.stop();
   } catch (err) {
     spinner?.stop();
-    return `Commit failed: ${err.message}`;
+    return { message: `Push failed: ${err.message}`, success: false };
   }
   if (isSelfSubmit) {
     const baseBranch = config2.baseBranch ?? "main";
@@ -152211,7 +152296,10 @@ async function performSubmit(config2, issue2, branch, username, interactive, com
         spinner?.stop();
       } catch (err) {
         spinner?.stop();
-        return `Committed and pushed to ${branch}, but failed to merge into ${targetBranch}: ${err.message}`;
+        return {
+          message: `Committed and pushed to ${branch}, but failed to merge into ${targetBranch}: ${err.message}`,
+          success: false
+        };
       }
     }
     if (!isTaskBranch(targetBranch) && targetBranch !== baseBranch) {
@@ -152222,7 +152310,10 @@ async function performSubmit(config2, issue2, branch, username, interactive, com
         spinner?.stop();
       } catch (err) {
         spinner?.stop();
-        return `Committed and merged ${branch} -> ${targetBranch}, but failed to merge ${targetBranch} into ${baseBranch}: ${err.message}`;
+        return {
+          message: `Committed and merged ${branch} -> ${targetBranch}, but failed to merge ${targetBranch} into ${baseBranch}: ${err.message}`,
+          success: false
+        };
       }
     }
     spinner = interactive ? ora("Closing issue...").start() : void 0;
@@ -152237,9 +152328,12 @@ async function performSubmit(config2, issue2, branch, username, interactive, com
     }
     setConfig({ taskState: { activeIssueNumber: void 0, baseCommit: void 0, activeBranch: void 0 } });
     const mergePath = finalBranch === targetBranch ? `${branch} -> ${targetBranch}` : `${branch} -> ${targetBranch} -> ${finalBranch}`;
-    return `Task #${issue2.number} committed and closed.
+    return {
+      message: `Task #${issue2.number} committed and closed.
 Merged: ${mergePath}
-Commit: "${commitMessage.trim()}"`;
+Commit: "${commitMessage.trim()}"`,
+      success: true
+    };
   }
   spinner = interactive ? ora("Checking for existing PR...").start() : void 0;
   const existingPR = await getTaskPR(config2, issue2.number, branch);
@@ -152266,7 +152360,7 @@ ${review}` : ""
       spinner?.stop();
     } catch (err) {
       spinner?.stop();
-      return `Committed but PR creation failed: ${err.message}`;
+      return { message: `Committed but PR creation failed: ${err.message}`, success: false };
     }
   }
   spinner = interactive ? ora("Marking as in-review...").start() : void 0;
@@ -152275,16 +152369,22 @@ ${review}` : ""
     spinner?.stop();
   } catch (err) {
     spinner?.stop();
-    return interactive ? `PR ${existingPR ? "updated" : "created"} (${prUrl}) but failed to update label: ${err.message}` : `PR ${existingPR ? "updated" : "created"} (${prUrl}) but failed to update label: ${err.message}`;
+    return {
+      message: interactive ? `PR ${existingPR ? "updated" : "created"} (${prUrl}) but failed to update label: ${err.message}` : `PR ${existingPR ? "updated" : "created"} (${prUrl}) but failed to update label: ${err.message}`,
+      success: false
+    };
   }
   setConfig({ taskState: { activeIssueNumber: void 0, baseCommit: void 0, activeBranch: void 0 } });
-  return interactive ? `Task #${issue2.number} ${existingPR ? "re-submitted" : "submitted"}.
+  return {
+    message: interactive ? `Task #${issue2.number} ${existingPR ? "re-submitted" : "submitted"}.
 Commit: "${commitMessage.trim()}"
 PR: ${prUrl}` : `Task #${issue2.number} ${existingPR ? "re-submitted" : "submitted"}.
 Review:
 ${review}
 Commit: "${commitMessage.trim()}"
-PR: ${prUrl}`;
+PR: ${prUrl}`,
+    success: true
+  };
 }
 function formatSubmitResult(result, notices) {
   if (notices.length === 0) return result;
@@ -152313,6 +152413,7 @@ var definition = {
 };
 async function run(_input, config2) {
   const currentBranch = await getCurrentBranch();
+  const previousTaskState = getConfig().taskState;
   const [username, currentIssueNumber] = await Promise.all([
     getAuthenticatedUser(config2),
     resolveIssueNumberFromBranch(config2, currentBranch)
@@ -152328,18 +152429,27 @@ async function run(_input, config2) {
   }
   let branch;
   let notices;
+  let restore;
   try {
-    ({ branch, notices } = await prepareTaskContext(config2, selectedTask, username, currentBranch, true));
+    ({ branch, notices, restore } = await prepareTaskContext(
+      config2,
+      selectedTask,
+      username,
+      currentBranch,
+      true,
+      void 0,
+      previousTaskState
+    ));
   } catch (err) {
     return err.message;
   }
-  return formatSubmitResult(
-    await performSubmit(config2, selectedTask, branch, username, true),
-    notices
-  );
+  const outcome = await performSubmit(config2, selectedTask, branch, username, true);
+  const allNotices = outcome.success && restore ? notices.concat(await restorePreviousContext(restore)) : notices;
+  return formatSubmitResult(outcome.message, allNotices);
 }
 async function execute(input, config2) {
   const currentBranch = await getCurrentBranch();
+  const previousTaskState = getConfig().taskState;
   const username = await getAuthenticatedUser(config2);
   const requestedIssueNumber = input["issue_number"];
   const carryCurrentWork = input["carry_current_work"];
@@ -152356,29 +152466,30 @@ async function execute(input, config2) {
   }
   let branch;
   let notices;
+  let restore;
   try {
-    ({ branch, notices } = await prepareTaskContext(
+    ({ branch, notices, restore } = await prepareTaskContext(
       config2,
       issue2,
       username,
       currentBranch,
       false,
-      carryCurrentWork
+      carryCurrentWork,
+      previousTaskState
     ));
   } catch (err) {
     return err.message;
   }
-  return formatSubmitResult(
-    await performSubmit(
-      config2,
-      issue2,
-      branch,
-      username,
-      false,
-      input["commit_message"]
-    ),
-    notices
+  const outcome = await performSubmit(
+    config2,
+    issue2,
+    branch,
+    username,
+    false,
+    input["commit_message"]
   );
+  const allNotices = outcome.success && restore ? notices.concat(await restorePreviousContext(restore)) : notices;
+  return formatSubmitResult(outcome.message, allNotices);
 }
 var terminal2 = true;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "techunter",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "AI-powered task distribution CLI for development teams",
   "author": "Techunter Contributors",
   "license": "MIT",