ai-hero-cli 0.3.1 → 0.4.0

package/bin.cjs

@@ -84936,6 +84936,7 @@ var parseCommits = (commitHistory) => {
 var selectLessonCommit = ({
   branch,
   excludeCurrentBranch,
+  extraChoices,
   lessonId,
   promptMessage
 }) => Effect_exports.gen(function* () {
@@ -84979,14 +84980,27 @@ var selectLessonCommit = ({
     const sortedCommits = commitsWithLessonIds.sort((a, b) => {
       return a.lessonId.localeCompare(b.lessonId);
     });
-    selectedLessonId = yield* promptService.selectLessonCommit(
-      sortedCommits.map((commit) => ({
+    const choices = [
+      ...extraChoices ?? [],
+      ...sortedCommits.map((commit) => ({
         lessonId: commit.lessonId,
         message: commit.message
-      })),
+      }))
+    ];
+    selectedLessonId = yield* promptService.selectLessonCommit(
+      choices,
       promptMessage
     );
   }
+  const isExtraChoice = extraChoices?.some(
+    (c) => c.lessonId === selectedLessonId
+  );
+  if (isExtraChoice) {
+    return {
+      commit: { sha: "", message: "", lessonId: null },
+      lessonId: selectedLessonId
+    };
+  }
   const matchingCommits = commits.filter(
     (commit) => commit.lessonId === selectedLessonId
   );
@@ -87688,10 +87702,10 @@ var internal = Command_exports.make("internal").pipe(
 );
 
 // src/pull.ts
-var InvalidBranchOperationError2 = class extends Data_exports.TaggedError(
+(class extends Data_exports.TaggedError(
   "InvalidBranchOperationError"
 ) {
-};
+});
 var UncommittedChangesError = class extends Data_exports.TaggedError(
   "UncommittedChangesError"
 ) {
@@ -87699,11 +87713,17 @@ var UncommittedChangesError = class extends Data_exports.TaggedError(
 var runPull = (opts) => Effect_exports.gen(function* () {
   const git = yield* GitService;
   yield* git.ensureIsGitRepo();
-  const currentBranch = yield* git.getCurrentBranch();
-  if (currentBranch === "main") {
-    return yield* new InvalidBranchOperationError2({
-      message: "Cannot pull when on main branch. Switch to a working branch first."
-    });
+  let workingBranch = yield* git.getCurrentBranch();
+  if (workingBranch === "main") {
+    const promptService = yield* PromptService;
+    yield* Console_exports.log(
+      "You're on the main branch. To avoid losing work, create a dev branch to pull upstream changes into."
+    );
+    const branchName = yield* promptService.inputBranchName(
+      "working"
+    );
+    yield* git.checkoutNewBranch(branchName);
+    workingBranch = branchName;
   }
   const { hasUncommittedChanges, statusOutput } = yield* git.getUncommittedChanges();
   if (hasUncommittedChanges) {
@@ -87715,12 +87735,12 @@ var runPull = (opts) => Effect_exports.gen(function* () {
   yield* Console_exports.log("Fetching main from upstream...");
   yield* git.fetch("upstream", "main");
   yield* Console_exports.log(
-    `Merging upstream/main into ${currentBranch}...`
+    `Merging upstream/main into ${workingBranch}...`
   );
   yield* git.merge("upstream/main");
   yield* Console_exports.log(
     `
-\u2713 Successfully merged upstream/main into ${currentBranch}`
+\u2713 Successfully merged upstream/main into ${workingBranch}`
   );
 });
 var pull = Command_exports.make(
@@ -87777,6 +87797,17 @@ var pull = Command_exports.make(
           );
           process.exitCode = 1;
         });
+      },
+      PromptCancelledError: () => {
+        return Effect_exports.gen(function* () {
+          yield* Console_exports.log("\nPull cancelled.");
+        });
+      },
+      FailedToCreateBranchError: (error4) => {
+        return Effect_exports.gen(function* () {
+          yield* Console_exports.error(`Error: ${error4.message}`);
+          process.exitCode = 1;
+        });
       }
     }),
     Effect_exports.catchAll((error4) => {
@@ -87811,14 +87842,39 @@ var runReset = ({
   yield* git.ensureUpstreamBranchConnected({
     targetBranch: branch
   });
-  const { commit: targetCommit, lessonId: selectedLessonId } = yield* selectLessonCommit({
-    branch,
-    lessonId,
-    promptMessage: "Which lesson do you want to reset to? (type to search)",
-    excludeCurrentBranch: false
-  });
-  const commitToUse = targetCommit.sha;
+  const isExplicitMain = Option_exports.isSome(lessonId) && lessonId.value === "main";
+  let commitToUse;
+  let selectedLessonId;
+  if (isExplicitMain) {
+    yield* git.fetch("upstream", "main");
+    commitToUse = yield* git.revParse("upstream/main");
+    selectedLessonId = "main";
+  } else {
+    const result = yield* selectLessonCommit({
+      branch,
+      lessonId,
+      promptMessage: "Which lesson do you want to reset to? (type to search)",
+      excludeCurrentBranch: false,
+      extraChoices: [
+        { lessonId: "main", message: "Reset to the starting point" }
+      ]
+    });
+    if (result.lessonId === "main") {
+      yield* git.fetch("upstream", "main");
+      commitToUse = yield* git.revParse("upstream/main");
+      selectedLessonId = "main";
+    } else {
+      commitToUse = result.commit.sha;
+      selectedLessonId = result.lessonId;
+    }
+  }
+  const isResetToMain = selectedLessonId === "main";
   const currentBranch = yield* git.getCurrentBranch();
+  if (isResetToMain && currentBranch === "main") {
+    return yield* new InvalidBranchOperationError3({
+      message: "Cannot reset to main while on the main branch. Create a new branch first."
+    });
+  }
   let action;
   if (currentBranch === "main") {
     yield* Console_exports.log(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-hero-cli",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "type": "module",
   "description": "The CLI used to run exercises for the AI Hero course",
   "bin": "bin.cjs",