techunter 1.2.1 → 1.2.3

package/dist/index.cjs

@@ -146943,14 +146943,14 @@ async function printTaskList(config) {
       const roots = childrenOf.get(null) ?? [];
       for (let i2 = 0; i2 < roots.length; i2++) {
         const isLast = i2 === roots.length - 1;
-        printTask2(roots[i2], "", isLast ? "\\-- " : "|-- ", isLast);
+        printTask2(roots[i2], "", "", isLast);
       }
       const remaining = tasks.filter((task) => !visited.has(task.number));
       if (remaining.length > 0) {
         console.log(source_default.yellow("  Warning: task hierarchy contains orphaned or cyclic links; showing remaining tasks at root."));
         for (let i2 = 0; i2 < remaining.length; i2++) {
           const isLast = i2 === remaining.length - 1;
-          printTask2(remaining[i2], "", isLast ? "\\-- " : "|-- ", isLast);
+          printTask2(remaining[i2], "", "", isLast);
         }
       }
     }
@@ -147248,8 +147248,9 @@ ${rollbackNotices.join("\n")}` : "";
     throw new Error(`Could not prepare task #${issue.number}: ${err.message}${details}`);
   }
 }
-async function restoreTaskTransitionContext(context) {
+async function restoreTaskTransitionContext(context, options2 = {}) {
   const notices = [];
+  const syncBranch = options2.syncBranch ?? true;
   try {
     await switchToBranchOrCreate(context.originalBranch);
     notices.push(`Returned to ${context.originalBranch}.`);
@@ -147260,29 +147261,33 @@ async function restoreTaskTransitionContext(context) {
     }
     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.");
-    }
-    setConfig({
-      taskState: context.previousTaskState ?? {
-        activeIssueNumber: void 0,
-        baseCommit: void 0,
-        activeBranch: void 0,
-        resumeStack: void 0
+  if (syncBranch) {
+    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.`
+        );
       }
-    });
-    return notices;
+    } 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.");
+      }
+      setConfig({
+        taskState: context.previousTaskState ?? {
+          activeIssueNumber: void 0,
+          baseCommit: void 0,
+          activeBranch: void 0,
+          resumeStack: void 0
+        }
+      });
+      return notices;
+    }
+  } else {
+    notices.push(`Skipped syncing ${context.originalBranch} with origin/${context.originalBranch} before restoring your work.`);
   }
   if (context.restoreStash) {
     try {
@@ -147611,6 +147616,7 @@ ${diff || "(no changes)"}`,
 var decisionSchema2 = external_exports.object({
   action: external_exports.enum(["restore", "stay"]),
   candidateIndex: external_exports.number().int().min(0).optional(),
+  syncBeforeRestore: external_exports.boolean().optional(),
   reason: external_exports.string().min(1),
   confidence: external_exports.enum(["low", "medium", "high"])
 });
@@ -147652,14 +147658,32 @@ function buildFallbackTaskResumeDecision(candidates) {
   return {
     action: "restore",
     candidateIndex: restorable >= 0 ? restorable : 0,
+    syncBeforeRestore: true,
     reason: restorable >= 0 ? "A deferred parent context has stashed work waiting to be restored." : "A deferred parent context exists, so returning there is the safest completion state.",
     confidence: "high",
     source: "heuristic"
   };
 }
+function materializeResumeContext(candidate) {
+  return {
+    originalBranch: candidate.originalBranch,
+    restoreStash: candidate.restoreStash,
+    previousTaskState: candidate.taskStateSnapshot ? {
+      ...candidate.taskStateSnapshot
+    } : void 0
+  };
+}
 async function planPostSubmitResume(config, options2) {
   const deferredCandidates = buildResumeCandidates(options2.taskState, options2.issueNumber);
-  const candidates = options2.immediateRestore ? [options2.immediateRestore, ...deferredCandidates] : deferredCandidates;
+  const candidates = options2.immediateRestore ? [{
+    originalBranch: options2.immediateRestore.originalBranch,
+    restoreStash: options2.immediateRestore.restoreStash,
+    taskStateSnapshot: options2.immediateRestore.previousTaskState ? {
+      activeIssueNumber: options2.immediateRestore.previousTaskState.activeIssueNumber,
+      baseCommit: options2.immediateRestore.previousTaskState.baseCommit,
+      activeBranch: options2.immediateRestore.previousTaskState.activeBranch
+    } : void 0
+  }, ...deferredCandidates] : deferredCandidates;
   const fallback2 = buildFallbackTaskResumeDecision(candidates);
   if (candidates.length === 0) {
     return { decision: fallback2 };
@@ -147679,7 +147703,8 @@ async function planPostSubmitResume(config, options2) {
     "You are deciding the best post-submit repository state for Techunter.",
     "Prefer restoring the most relevant deferred parent context when it contains stashed work or unfinished parent-task state.",
     'Choose "stay" only when staying on the current branch is clearly safer than restoring any deferred parent context.',
-    'Respond with JSON only: {"action":"restore|stay","candidateIndex":0,"reason":"...","confidence":"low|medium|high"}'
+    'When action is "restore", also decide whether Techunter should sync the branch with origin before restoring stashed work.',
+    'Respond with JSON only: {"action":"restore|stay","candidateIndex":0,"syncBeforeRestore":true,"reason":"...","confidence":"low|medium|high"}'
   ].join("\n");
   const user = [
     `Submitted task: #${options2.issueNumber}`,
@@ -147710,14 +147735,14 @@ async function planPostSubmitResume(config, options2) {
     if (!content) {
       return {
         decision: fallback2,
-        selectedContext: fallback2.action === "restore" && fallback2.candidateIndex !== void 0 ? candidates[fallback2.candidateIndex] : void 0
+        selectedContext: fallback2.action === "restore" && fallback2.candidateIndex !== void 0 ? materializeResumeContext(candidates[fallback2.candidateIndex]) : void 0
       };
     }
     const parsed = decisionSchema2.safeParse(JSON.parse(content));
     if (!parsed.success) {
       return {
         decision: fallback2,
-        selectedContext: fallback2.action === "restore" && fallback2.candidateIndex !== void 0 ? candidates[fallback2.candidateIndex] : void 0
+        selectedContext: fallback2.action === "restore" && fallback2.candidateIndex !== void 0 ? materializeResumeContext(candidates[fallback2.candidateIndex]) : void 0
       };
     }
     if (parsed.data.action === "restore") {
@@ -147726,23 +147751,25 @@ async function planPostSubmitResume(config, options2) {
       if (!selectedContext) {
         return {
           decision: fallback2,
-          selectedContext: fallback2.action === "restore" && fallback2.candidateIndex !== void 0 ? candidates[fallback2.candidateIndex] : void 0
+          selectedContext: fallback2.action === "restore" && fallback2.candidateIndex !== void 0 ? materializeResumeContext(candidates[fallback2.candidateIndex]) : void 0
         };
       }
       return {
         decision: {
           action: "restore",
           candidateIndex: index,
+          syncBeforeRestore: parsed.data.syncBeforeRestore ?? true,
           reason: parsed.data.reason,
           confidence: parsed.data.confidence,
           source: "agent"
         },
-        selectedContext
+        selectedContext: materializeResumeContext(selectedContext)
       };
     }
     return {
       decision: {
         action: "stay",
+        syncBeforeRestore: void 0,
         reason: parsed.data.reason,
         confidence: parsed.data.confidence,
         source: "agent"
@@ -147751,7 +147778,7 @@ async function planPostSubmitResume(config, options2) {
   } catch {
     return {
       decision: fallback2,
-      selectedContext: fallback2.action === "restore" && fallback2.candidateIndex !== void 0 ? candidates[fallback2.candidateIndex] : void 0
+      selectedContext: fallback2.action === "restore" && fallback2.candidateIndex !== void 0 ? materializeResumeContext(candidates[fallback2.candidateIndex]) : void 0
     };
   }
 }
@@ -148166,7 +148193,9 @@ async function finalizePostSubmitContext(config, issueNumber, branch, immediateR
     `Resume planner: ${decision.source} chose ${decision.action} (${decision.confidence}) - ${decision.reason}`
   ];
   if (decision.action === "restore" && selectedContext) {
-    const restored = await restoreTaskTransitionContext(selectedContext);
+    const restored = await restoreTaskTransitionContext(selectedContext, {
+      syncBranch: decision.syncBeforeRestore ?? true
+    });
     return notices.concat(restored);
   }
   setConfig({
@@ -151459,7 +151488,7 @@ async function startAutoUpdate(currentVersion) {
 }
 
 // src/index.ts
-var version = "1.2.1";
+var version = "1.2.3";
 var SLASH_NAMES = [
   "/help",
   "/h",

package/dist/mcp.cjs

@@ -143805,14 +143805,14 @@ async function printTaskList(config2) {
       const roots = childrenOf.get(null) ?? [];
       for (let i2 = 0; i2 < roots.length; i2++) {
         const isLast = i2 === roots.length - 1;
-        printTask2(roots[i2], "", isLast ? "\\-- " : "|-- ", isLast);
+        printTask2(roots[i2], "", "", isLast);
       }
       const remaining = tasks.filter((task) => !visited.has(task.number));
       if (remaining.length > 0) {
         console.log(source_default.yellow("  Warning: task hierarchy contains orphaned or cyclic links; showing remaining tasks at root."));
         for (let i2 = 0; i2 < remaining.length; i2++) {
           const isLast = i2 === remaining.length - 1;
-          printTask2(remaining[i2], "", isLast ? "\\-- " : "|-- ", isLast);
+          printTask2(remaining[i2], "", "", isLast);
         }
       }
     }
@@ -151899,8 +151899,9 @@ ${rollbackNotices.join("\n")}` : "";
     throw new Error(`Could not prepare task #${issue2.number}: ${err.message}${details}`);
   }
 }
-async function restoreTaskTransitionContext(context) {
+async function restoreTaskTransitionContext(context, options2 = {}) {
   const notices = [];
+  const syncBranch = options2.syncBranch ?? true;
   try {
     await switchToBranchOrCreate(context.originalBranch);
     notices.push(`Returned to ${context.originalBranch}.`);
@@ -151911,29 +151912,33 @@ async function restoreTaskTransitionContext(context) {
     }
     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.");
-    }
-    setConfig({
-      taskState: context.previousTaskState ?? {
-        activeIssueNumber: void 0,
-        baseCommit: void 0,
-        activeBranch: void 0,
-        resumeStack: void 0
+  if (syncBranch) {
+    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.`
+        );
       }
-    });
-    return notices;
+    } 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.");
+      }
+      setConfig({
+        taskState: context.previousTaskState ?? {
+          activeIssueNumber: void 0,
+          baseCommit: void 0,
+          activeBranch: void 0,
+          resumeStack: void 0
+        }
+      });
+      return notices;
+    }
+  } else {
+    notices.push(`Skipped syncing ${context.originalBranch} with origin/${context.originalBranch} before restoring your work.`);
   }
   if (context.restoreStash) {
     try {
@@ -152327,6 +152332,7 @@ ${diff || "(no changes)"}`,
 var decisionSchema2 = external_exports.object({
   action: external_exports.enum(["restore", "stay"]),
   candidateIndex: external_exports.number().int().min(0).optional(),
+  syncBeforeRestore: external_exports.boolean().optional(),
   reason: external_exports.string().min(1),
   confidence: external_exports.enum(["low", "medium", "high"])
 });
@@ -152368,14 +152374,32 @@ function buildFallbackTaskResumeDecision(candidates) {
   return {
     action: "restore",
     candidateIndex: restorable >= 0 ? restorable : 0,
+    syncBeforeRestore: true,
     reason: restorable >= 0 ? "A deferred parent context has stashed work waiting to be restored." : "A deferred parent context exists, so returning there is the safest completion state.",
     confidence: "high",
     source: "heuristic"
   };
 }
+function materializeResumeContext(candidate) {
+  return {
+    originalBranch: candidate.originalBranch,
+    restoreStash: candidate.restoreStash,
+    previousTaskState: candidate.taskStateSnapshot ? {
+      ...candidate.taskStateSnapshot
+    } : void 0
+  };
+}
 async function planPostSubmitResume(config2, options2) {
   const deferredCandidates = buildResumeCandidates(options2.taskState, options2.issueNumber);
-  const candidates = options2.immediateRestore ? [options2.immediateRestore, ...deferredCandidates] : deferredCandidates;
+  const candidates = options2.immediateRestore ? [{
+    originalBranch: options2.immediateRestore.originalBranch,
+    restoreStash: options2.immediateRestore.restoreStash,
+    taskStateSnapshot: options2.immediateRestore.previousTaskState ? {
+      activeIssueNumber: options2.immediateRestore.previousTaskState.activeIssueNumber,
+      baseCommit: options2.immediateRestore.previousTaskState.baseCommit,
+      activeBranch: options2.immediateRestore.previousTaskState.activeBranch
+    } : void 0
+  }, ...deferredCandidates] : deferredCandidates;
   const fallback2 = buildFallbackTaskResumeDecision(candidates);
   if (candidates.length === 0) {
     return { decision: fallback2 };
@@ -152395,7 +152419,8 @@ async function planPostSubmitResume(config2, options2) {
     "You are deciding the best post-submit repository state for Techunter.",
     "Prefer restoring the most relevant deferred parent context when it contains stashed work or unfinished parent-task state.",
     'Choose "stay" only when staying on the current branch is clearly safer than restoring any deferred parent context.',
-    'Respond with JSON only: {"action":"restore|stay","candidateIndex":0,"reason":"...","confidence":"low|medium|high"}'
+    'When action is "restore", also decide whether Techunter should sync the branch with origin before restoring stashed work.',
+    'Respond with JSON only: {"action":"restore|stay","candidateIndex":0,"syncBeforeRestore":true,"reason":"...","confidence":"low|medium|high"}'
   ].join("\n");
   const user = [
     `Submitted task: #${options2.issueNumber}`,
@@ -152426,14 +152451,14 @@ async function planPostSubmitResume(config2, options2) {
     if (!content) {
       return {
         decision: fallback2,
-        selectedContext: fallback2.action === "restore" && fallback2.candidateIndex !== void 0 ? candidates[fallback2.candidateIndex] : void 0
+        selectedContext: fallback2.action === "restore" && fallback2.candidateIndex !== void 0 ? materializeResumeContext(candidates[fallback2.candidateIndex]) : void 0
       };
     }
     const parsed = decisionSchema2.safeParse(JSON.parse(content));
     if (!parsed.success) {
       return {
         decision: fallback2,
-        selectedContext: fallback2.action === "restore" && fallback2.candidateIndex !== void 0 ? candidates[fallback2.candidateIndex] : void 0
+        selectedContext: fallback2.action === "restore" && fallback2.candidateIndex !== void 0 ? materializeResumeContext(candidates[fallback2.candidateIndex]) : void 0
       };
     }
     if (parsed.data.action === "restore") {
@@ -152442,23 +152467,25 @@ async function planPostSubmitResume(config2, options2) {
       if (!selectedContext) {
         return {
           decision: fallback2,
-          selectedContext: fallback2.action === "restore" && fallback2.candidateIndex !== void 0 ? candidates[fallback2.candidateIndex] : void 0
+          selectedContext: fallback2.action === "restore" && fallback2.candidateIndex !== void 0 ? materializeResumeContext(candidates[fallback2.candidateIndex]) : void 0
         };
       }
       return {
         decision: {
           action: "restore",
           candidateIndex: index,
+          syncBeforeRestore: parsed.data.syncBeforeRestore ?? true,
           reason: parsed.data.reason,
           confidence: parsed.data.confidence,
           source: "agent"
         },
-        selectedContext
+        selectedContext: materializeResumeContext(selectedContext)
       };
     }
     return {
       decision: {
         action: "stay",
+        syncBeforeRestore: void 0,
         reason: parsed.data.reason,
         confidence: parsed.data.confidence,
         source: "agent"
@@ -152467,7 +152494,7 @@ async function planPostSubmitResume(config2, options2) {
   } catch {
     return {
       decision: fallback2,
-      selectedContext: fallback2.action === "restore" && fallback2.candidateIndex !== void 0 ? candidates[fallback2.candidateIndex] : void 0
+      selectedContext: fallback2.action === "restore" && fallback2.candidateIndex !== void 0 ? materializeResumeContext(candidates[fallback2.candidateIndex]) : void 0
     };
   }
 }
@@ -152882,7 +152909,9 @@ async function finalizePostSubmitContext(config2, issueNumber, branch, immediate
     `Resume planner: ${decision.source} chose ${decision.action} (${decision.confidence}) - ${decision.reason}`
   ];
   if (decision.action === "restore" && selectedContext) {
-    const restored = await restoreTaskTransitionContext(selectedContext);
+    const restored = await restoreTaskTransitionContext(selectedContext, {
+      syncBranch: decision.syncBeforeRestore ?? true
+    });
     return notices.concat(restored);
   }
   setConfig({

package/package.json

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