ai-hero-cli 0.2.3 → 0.2.4

package/bin.cjs

@@ -5593,8 +5593,8 @@ ${ctx.indent}`;
         const vs0 = valueStr[0];
         const nl0 = valueStr.indexOf("\n");
         const hasNewline = nl0 !== -1;
-        const flow3 = ctx.inFlow ?? value5.flow ?? value5.items.length === 0;
-        if (hasNewline || !flow3) {
+        const flow2 = ctx.inFlow ?? value5.flow ?? value5.items.length === 0;
+        if (hasNewline || !flow2) {
           let hasPropsLine = false;
           if (hasNewline && (vs0 === "&" || vs0 === "!")) {
             let sp0 = valueStr.indexOf(" ");
@@ -5812,8 +5812,8 @@ var require_stringifyCollection = __commonJS({
     var stringify2 = require_stringify();
     var stringifyComment = require_stringifyComment();
     function stringifyCollection(collection, ctx, options3) {
-      const flow3 = ctx.inFlow ?? collection.flow;
-      const stringify3 = flow3 ? stringifyFlowCollection : stringifyBlockCollection;
+      const flow2 = ctx.inFlow ?? collection.flow;
+      const stringify3 = flow2 ? stringifyFlowCollection : stringifyBlockCollection;
       return stringify3(collection, ctx, options3);
     }
     function stringifyBlockCollection({ comment, items }, ctx, { blockItemPrefix, flowChars, itemIndent, onChompKeep, onComment }) {
@@ -7424,7 +7424,7 @@ var require_Document = __commonJS({
           options3 = replacer;
           replacer = void 0;
         }
-        const { aliasDuplicateObjects, anchorPrefix, flow: flow3, keepUndefined, onTagObj, tag: tag4 } = options3 ?? {};
+        const { aliasDuplicateObjects, anchorPrefix, flow: flow2, keepUndefined, onTagObj, tag: tag4 } = options3 ?? {};
         const { onAnchor, setAnchors, sourceObjects } = anchors.createNodeAnchors(
           this,
           // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -7440,7 +7440,7 @@ var require_Document = __commonJS({
           sourceObjects
         };
         const node = createNode.createNode(value5, tag4, ctx);
-        if (flow3 && identity3.isCollection(node))
+        if (flow2 && identity3.isCollection(node))
           node.flow = true;
         setAnchors();
         return node;
@@ -7686,7 +7686,7 @@ ${pointer}
 // node_modules/.pnpm/yaml@2.8.1/node_modules/yaml/dist/compose/resolve-props.js
 var require_resolve_props = __commonJS({
   "node_modules/.pnpm/yaml@2.8.1/node_modules/yaml/dist/compose/resolve-props.js"(exports) {
-    function resolveProps(tokens, { flow: flow3, indicator, next, offset, onError: onError4, parentIndent, startOnNewline }) {
+    function resolveProps(tokens, { flow: flow2, indicator, next, offset, onError: onError4, parentIndent, startOnNewline }) {
       let spaceBefore = false;
       let atNewline = startOnNewline;
       let hasSpace = startOnNewline;
@@ -7715,7 +7715,7 @@ var require_resolve_props = __commonJS({
         }
         switch (token.type) {
           case "space":
-            if (!flow3 && (indicator !== "doc-start" || next?.type !== "flow-collection") && token.source.includes("	")) {
+            if (!flow2 && (indicator !== "doc-start" || next?.type !== "flow-collection") && token.source.includes("	")) {
               tab = token;
             }
             hasSpace = true;
@@ -7771,15 +7771,15 @@ var require_resolve_props = __commonJS({
             if (anchor || tag4)
               onError4(token, "BAD_PROP_ORDER", `Anchors and tags must be after the ${token.source} indicator`);
             if (found)
-              onError4(token, "UNEXPECTED_TOKEN", `Unexpected ${token.source} in ${flow3 ?? "collection"}`);
+              onError4(token, "UNEXPECTED_TOKEN", `Unexpected ${token.source} in ${flow2 ?? "collection"}`);
             found = token;
             atNewline = indicator === "seq-item-ind" || indicator === "explicit-key-ind";
             hasSpace = false;
             break;
           case "comma":
-            if (flow3) {
+            if (flow2) {
               if (comma3)
-                onError4(token, "UNEXPECTED_TOKEN", `Unexpected , in ${flow3}`);
+                onError4(token, "UNEXPECTED_TOKEN", `Unexpected , in ${flow2}`);
               comma3 = token;
               atNewline = false;
               hasSpace = false;
@@ -11482,10 +11482,10 @@ var require_clear = __commonJS({
     var erase = _require.erase;
     var cursor = _require.cursor;
     var width3 = (str) => [...strip(str)].length;
-    module.exports = function(prompt6, perLine) {
+    module.exports = function(prompt7, perLine) {
       if (!perLine) return erase.line + cursor.to(0);
       let rows = 0;
-      const lines4 = prompt6.split(/\r?\n/);
+      const lines4 = prompt7.split(/\r?\n/);
       var _iterator = _createForOfIteratorHelper(lines4), _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done; ) {
@@ -13086,14 +13086,14 @@ Instructions:
         if (this.closed) return;
         if (this.firstRender) this.out.write(cursor.hide);
         super.render();
-        let prompt6 = [style.symbol(this.done, this.aborted), color3.bold(this.msg), style.delimiter(false), this.renderDoneOrInstructions()].join(" ");
+        let prompt7 = [style.symbol(this.done, this.aborted), color3.bold(this.msg), style.delimiter(false), this.renderDoneOrInstructions()].join(" ");
         if (this.showMinError) {
-          prompt6 += color3.red(`You must select a minimum of ${this.minSelected} choices.`);
+          prompt7 += color3.red(`You must select a minimum of ${this.minSelected} choices.`);
           this.showMinError = false;
         }
-        prompt6 += this.renderOptions(this.value);
-        this.out.write(this.clear + prompt6);
-        this.clear = clear3(prompt6, this.out.columns);
+        prompt7 += this.renderOptions(this.value);
+        this.out.write(this.clear + prompt7);
+        this.clear = clear3(prompt7, this.out.columns);
       }
     };
     module.exports = MultiselectPrompt;
@@ -13498,14 +13498,14 @@ Filtered results for: ${this.inputValue ? this.inputValue : color3.gray("Enter s
         if (this.closed) return;
         if (this.firstRender) this.out.write(cursor.hide);
         super.render();
-        let prompt6 = [style.symbol(this.done, this.aborted), color3.bold(this.msg), style.delimiter(false), this.renderDoneOrInstructions()].join(" ");
+        let prompt7 = [style.symbol(this.done, this.aborted), color3.bold(this.msg), style.delimiter(false), this.renderDoneOrInstructions()].join(" ");
         if (this.showMinError) {
-          prompt6 += color3.red(`You must select a minimum of ${this.minSelected} choices.`);
+          prompt7 += color3.red(`You must select a minimum of ${this.minSelected} choices.`);
           this.showMinError = false;
         }
-        prompt6 += this.renderOptions(this.filteredOptions);
-        this.out.write(this.clear + prompt6);
-        this.clear = clear3(prompt6, this.out.columns);
+        prompt7 += this.renderOptions(this.filteredOptions);
+        this.out.write(this.clear + prompt7);
+        this.clear = clear3(prompt7, this.out.columns);
       }
     };
     module.exports = AutocompleteMultiselectPrompt;
@@ -13785,7 +13785,7 @@ var require_dist2 = __commonJS({
     var passOn = ["suggest", "format", "onState", "validate", "onRender", "type"];
     var noop = () => {
     };
-    function prompt6() {
+    function prompt7() {
       return _prompt.apply(this, arguments);
     }
     function _prompt() {
@@ -13794,7 +13794,7 @@ var require_dist2 = __commonJS({
         onCancel = noop
       } = {}) {
         const answers = {};
-        const override2 = prompt6._override || {};
+        const override2 = prompt7._override || {};
         questions = [].concat(questions);
         let answer, question, quit, name, type2, lastPrompt;
         const getFormattedAnswer = /* @__PURE__ */ (function() {
@@ -13843,7 +13843,7 @@ var require_dist2 = __commonJS({
               }
             }
             try {
-              answer = prompt6._injected ? getInjectedAnswer(prompt6._injected, question.initial) : yield prompts[type2](question);
+              answer = prompt7._injected ? getInjectedAnswer(prompt7._injected, question.initial) : yield prompts[type2](question);
               answers[name] = answer = yield getFormattedAnswer(question, answer, true);
               quit = yield onSubmit(question, answer, answers);
             } catch (err) {
@@ -13868,13 +13868,13 @@ var require_dist2 = __commonJS({
       return answer === void 0 ? deafultValue : answer;
     }
     function inject(answers) {
-      prompt6._injected = (prompt6._injected || []).concat(answers);
+      prompt7._injected = (prompt7._injected || []).concat(answers);
     }
     function override(answers) {
-      prompt6._override = Object.assign({}, answers);
+      prompt7._override = Object.assign({}, answers);
     }
-    module.exports = Object.assign(prompt6, {
-      prompt: prompt6,
+    module.exports = Object.assign(prompt7, {
+      prompt: prompt7,
       prompts,
       inject,
       override
@@ -13938,10 +13938,10 @@ var require_clear2 = __commonJS({
     var strip = require_strip2();
     var { erase, cursor } = require_src();
     var width3 = (str) => [...strip(str)].length;
-    module.exports = function(prompt6, perLine) {
+    module.exports = function(prompt7, perLine) {
       if (!perLine) return erase.line + cursor.to(0);
       let rows = 0;
-      const lines4 = prompt6.split(/\r?\n/);
+      const lines4 = prompt7.split(/\r?\n/);
       for (let line4 of lines4) {
         rows += 1 + Math.floor(Math.max(width3(line4) - 1, 0) / perLine);
       }
@@ -15380,19 +15380,19 @@ Instructions:
         if (this.closed) return;
         if (this.firstRender) this.out.write(cursor.hide);
         super.render();
-        let prompt6 = [
+        let prompt7 = [
           style.symbol(this.done, this.aborted),
           color3.bold(this.msg),
           style.delimiter(false),
           this.renderDoneOrInstructions()
         ].join(" ");
         if (this.showMinError) {
-          prompt6 += color3.red(`You must select a minimum of ${this.minSelected} choices.`);
+          prompt7 += color3.red(`You must select a minimum of ${this.minSelected} choices.`);
           this.showMinError = false;
         }
-        prompt6 += this.renderOptions(this.value);
-        this.out.write(this.clear + prompt6);
-        this.clear = clear3(prompt6, this.out.columns);
+        prompt7 += this.renderOptions(this.value);
+        this.out.write(this.clear + prompt7);
+        this.clear = clear3(prompt7, this.out.columns);
       }
     };
     module.exports = MultiselectPrompt;
@@ -15754,19 +15754,19 @@ Filtered results for: ${this.inputValue ? this.inputValue : color3.gray("Enter s
         if (this.closed) return;
         if (this.firstRender) this.out.write(cursor.hide);
         super.render();
-        let prompt6 = [
+        let prompt7 = [
           style.symbol(this.done, this.aborted),
           color3.bold(this.msg),
           style.delimiter(false),
           this.renderDoneOrInstructions()
         ].join(" ");
         if (this.showMinError) {
-          prompt6 += color3.red(`You must select a minimum of ${this.minSelected} choices.`);
+          prompt7 += color3.red(`You must select a minimum of ${this.minSelected} choices.`);
           this.showMinError = false;
         }
-        prompt6 += this.renderOptions(this.filteredOptions);
-        this.out.write(this.clear + prompt6);
-        this.clear = clear3(prompt6, this.out.columns);
+        prompt7 += this.renderOptions(this.filteredOptions);
+        this.out.write(this.clear + prompt7);
+        this.clear = clear3(prompt7, this.out.columns);
       }
     };
     module.exports = AutocompleteMultiselectPrompt;
@@ -15934,9 +15934,9 @@ var require_lib = __commonJS({
     var passOn = ["suggest", "format", "onState", "validate", "onRender", "type"];
     var noop = () => {
     };
-    async function prompt6(questions = [], { onSubmit = noop, onCancel = noop } = {}) {
+    async function prompt7(questions = [], { onSubmit = noop, onCancel = noop } = {}) {
       const answers = {};
-      const override2 = prompt6._override || {};
+      const override2 = prompt7._override || {};
       questions = [].concat(questions);
       let answer, question, quit, name, type2, lastPrompt;
       const getFormattedAnswer = async (question2, answer2, skipValidation = false) => {
@@ -15973,7 +15973,7 @@ var require_lib = __commonJS({
           }
         }
         try {
-          answer = prompt6._injected ? getInjectedAnswer(prompt6._injected, question.initial) : await prompts[type2](question);
+          answer = prompt7._injected ? getInjectedAnswer(prompt7._injected, question.initial) : await prompts[type2](question);
           answers[name] = answer = await getFormattedAnswer(question, answer, true);
           quit = await onSubmit(question, answer, answers);
         } catch (err) {
@@ -15991,12 +15991,12 @@ var require_lib = __commonJS({
       return answer === void 0 ? deafultValue : answer;
     }
     function inject(answers) {
-      prompt6._injected = (prompt6._injected || []).concat(answers);
+      prompt7._injected = (prompt7._injected || []).concat(answers);
     }
     function override(answers) {
-      prompt6._override = Object.assign({}, answers);
+      prompt7._override = Object.assign({}, answers);
     }
-    module.exports = Object.assign(prompt6, { prompt: prompt6, prompts, inject, override });
+    module.exports = Object.assign(prompt7, { prompt: prompt7, prompts, inject, override });
   }
 });
 
@@ -27360,7 +27360,7 @@ var require_mock_pool = __commonJS({
 var require_pending_interceptors_formatter = __commonJS({
   "node_modules/.pnpm/undici@7.13.0/node_modules/undici/lib/mock/pending-interceptors-formatter.js"(exports, module) {
     var { Transform } = __require("stream");
-    var { Console: Console3 } = __require("console");
+    var { Console: Console2 } = __require("console");
     var PERSISTENT = process.versions.icu ? "\u2705" : "Y ";
     var NOT_PERSISTENT = process.versions.icu ? "\u274C" : "N ";
     module.exports = class PendingInterceptorsFormatter {
@@ -27370,7 +27370,7 @@ var require_pending_interceptors_formatter = __commonJS({
             cb(null, chunk4);
           }
         });
-        this.logger = new Console3({
+        this.logger = new Console2({
           stdout: this.transform,
           inspectOptions: {
             colors: !disableColors && !process.env.CI
@@ -42029,7 +42029,7 @@ var require_lodash = __commonJS({
         function defaultTo(value5, defaultValue) {
           return value5 == null || value5 !== value5 ? defaultValue : value5;
         }
-        var flow3 = createFlow();
+        var flow2 = createFlow();
         var flowRight = createFlow(true);
         function identity3(value5) {
           return value5;
@@ -42229,7 +42229,7 @@ var require_lodash = __commonJS({
         lodash.flattenDeep = flattenDeep;
         lodash.flattenDepth = flattenDepth;
         lodash.flip = flip3;
-        lodash.flow = flow3;
+        lodash.flow = flow2;
         lodash.flowRight = flowRight;
         lodash.fromPairs = fromPairs;
         lodash.functions = functions;
@@ -75481,8 +75481,8 @@ var make59 = /* @__PURE__ */ fnUntraced2(function* (shouldQuit = defaultShouldQu
     readlineInterface.once("line", onLine);
     return sync5(() => readlineInterface.off("line", onLine));
   })), scoped2);
-  const display = (prompt6) => uninterruptible2(async2((resume2) => {
-    stdout3.write(prompt6, (err) => err ? resume2(fail9(new BadArgument({
+  const display = (prompt7) => uninterruptible2(async2((resume2) => {
+    stdout3.write(prompt7, (err) => err ? resume2(fail9(new BadArgument({
       module: "Terminal",
       method: "display",
       description: "Failed to write prompt to stdout",
@@ -77753,8 +77753,8 @@ var run5 = /* @__PURE__ */ fnUntraced2(function* (self2) {
   const input = yield* terminal.readInput;
   return yield* runWithInput(self2, terminal, input);
 }, /* @__PURE__ */ mapError2(() => new QuitException()), scoped2);
-var runWithInput = (prompt6, terminal, input) => suspend4(() => {
-  const op = prompt6;
+var runWithInput = (prompt7, terminal, input) => suspend4(() => {
+  const op = prompt7;
   switch (op._tag) {
     case "Loop": {
       return runLoop(op, terminal, input);
@@ -77967,8 +77967,8 @@ function eraseText(text11, columns) {
   }
   return eraseLines3(rows);
 }
-function lines3(prompt6, columns) {
-  const lines4 = prompt6.split(/\r?\n/);
+function lines3(prompt7, columns) {
+  const lines4 = prompt7.split(/\r?\n/);
   return columns === 0 ? lines4.length : pipe(map3(lines4, (line4) => Math.ceil(line4.length / columns)), reduce(0, (left3, right3) => left3 + right3));
 }
 
@@ -81031,11 +81031,11 @@ var withFallbackConfig3 = /* @__PURE__ */ dual(2, (self2, config3) => {
   }
   return makeWithFallback(self2, config3);
 });
-var withFallbackPrompt = /* @__PURE__ */ dual(2, (self2, prompt6) => {
+var withFallbackPrompt = /* @__PURE__ */ dual(2, (self2, prompt7) => {
   if (isInstruction2(self2) && isWithDefault2(self2)) {
-    return makeWithDefault2(withFallbackPrompt(self2.options, prompt6), self2.fallback);
+    return makeWithDefault2(withFallbackPrompt(self2.options, prompt7), self2.fallback);
   }
-  return makeWithFallback(self2, prompt6);
+  return makeWithFallback(self2, prompt7);
 });
 var withDescription4 = /* @__PURE__ */ dual(2, (self2, desc) => modifySingle(self2, (single2) => {
   const description = sequence(single2.description, p(desc));
@@ -82178,12 +82178,12 @@ var make65 = (name, options3 = none14, args2 = none12) => {
   op.args = args2;
   return op;
 };
-var prompt = (name, prompt6) => {
+var prompt = (name, prompt7) => {
   const op = Object.create(proto23);
   op._tag = "GetUserInput";
   op.name = name;
   op.description = empty39;
-  op.prompt = prompt6;
+  op.prompt = prompt7;
   return op;
 };
 var getHelp7 = (self2, config3) => getHelpInternal4(self2, config3);
@@ -83024,7 +83024,7 @@ var getUsage6 = (self2) => getUsage5(self2.descriptor);
 var mapDescriptor = /* @__PURE__ */ dual(2, (self2, f) => makeDerive(self2, {
   descriptor: f(self2.descriptor)
 }));
-var prompt2 = (name, prompt6, handler) => makeProto(map35(prompt(name, prompt6), (_) => _.value), handler, GenericTag(`@effect/cli/Prompt/${name}`));
+var prompt2 = (name, prompt7, handler) => makeProto(map35(prompt(name, prompt7), (_) => _.value), handler, GenericTag(`@effect/cli/Prompt/${name}`));
 var withHandler = /* @__PURE__ */ dual(2, (self2, handler) => makeDerive(self2, {
   handler,
   transform: identity
@@ -83125,18 +83125,194 @@ var make69 = make42;
 var makeWith2 = makeWith;
 var makeCacheStats2 = makeCacheStats;
 var makeEntryStats2 = makeEntryStats;
-var NotAGitRepoError = class extends Data_exports.TaggedError(
-  "NotAGitRepoError"
+
+// src/commit-utils.ts
+var import_prompts = __toESM(require_prompts3());
+
+// src/prompt-utils.ts
+var PromptCancelledError = class extends Data_exports.TaggedError(
+  "PromptCancelledError"
 ) {
 };
+var runPrompt = (promptFn) => {
+  return Effect_exports.gen(function* () {
+    const result = yield* Effect_exports.promise(() => promptFn());
+    if (Object.keys(result).length === 0) {
+      return yield* new PromptCancelledError();
+    }
+    return result;
+  });
+};
+
+// src/commit-utils.ts
 var CommitNotFoundError = class extends Data_exports.TaggedError(
   "CommitNotFoundError"
 ) {
 };
+var NoParentCommitError = class extends Data_exports.TaggedError(
+  "NoParentCommitError"
+) {
+};
+var parseCommits = (commitHistory) => {
+  return commitHistory.trim().split("\n").filter(Boolean).map((line4) => {
+    const [sha, ...messageParts] = line4.split(" ");
+    const fullMessage = messageParts.join(" ");
+    const lessonMatch = fullMessage.match(
+      /^(\d+)[.-](\d+)[.-](\d+)\s*/
+    );
+    const extractedLessonId = lessonMatch ? `${lessonMatch[1].padStart(
+      2,
+      "0"
+    )}.${lessonMatch[2].padStart(
+      2,
+      "0"
+    )}.${lessonMatch[3].padStart(2, "0")}` : null;
+    const message = lessonMatch ? fullMessage.slice(lessonMatch[0].length).trim() : fullMessage;
+    return {
+      sha,
+      message,
+      lessonId: extractedLessonId
+    };
+  });
+};
+var selectLessonCommit = ({
+  branch,
+  cwd,
+  excludeCurrentBranch,
+  lessonId,
+  promptMessage
+}) => Effect_exports.gen(function* () {
+  let commits;
+  if (excludeCurrentBranch) {
+    const currentBranchCommand = Command_exports.make(
+      "git",
+      "log",
+      "HEAD",
+      "--oneline"
+    ).pipe(Command_exports.workingDirectory(cwd));
+    const currentBranchHistory = yield* Command_exports.string(
+      currentBranchCommand
+    );
+    const currentBranchCommits = parseCommits(currentBranchHistory);
+    const currentLessonIds = new Set(
+      currentBranchCommits.filter((c) => c.lessonId !== null).map((c) => c.lessonId)
+    );
+    const targetBranchCommand = Command_exports.make(
+      "git",
+      "log",
+      branch,
+      "--oneline"
+    ).pipe(Command_exports.workingDirectory(cwd));
+    const targetBranchHistory = yield* Command_exports.string(
+      targetBranchCommand
+    );
+    const allTargetCommits = parseCommits(targetBranchHistory);
+    commits = allTargetCommits.filter(
+      (c) => !c.lessonId || !currentLessonIds.has(c.lessonId)
+    );
+  } else {
+    const gitLogCommand = Command_exports.make(
+      "git",
+      "log",
+      branch,
+      "--oneline"
+    ).pipe(Command_exports.workingDirectory(cwd));
+    const commitHistory = yield* Command_exports.string(gitLogCommand);
+    commits = parseCommits(commitHistory);
+  }
+  let selectedLessonId;
+  if (Option_exports.isSome(lessonId)) {
+    selectedLessonId = lessonId.value;
+    yield* Console_exports.log(
+      `Searching for lesson ${selectedLessonId} on branch ${branch}...`
+    );
+  } else {
+    const commitsWithLessonIds = commits.filter(
+      (commit) => commit.lessonId !== null
+    );
+    if (commitsWithLessonIds.length === 0) {
+      return yield* Effect_exports.fail(
+        new CommitNotFoundError({
+          lessonId: "any",
+          branch
+        })
+      );
+    }
+    const sortedCommits = commitsWithLessonIds.sort((a, b) => {
+      return a.lessonId.localeCompare(b.lessonId);
+    });
+    const { lesson } = yield* runPrompt(
+      () => (0, import_prompts.default)([
+        {
+          type: "autocomplete",
+          name: "lesson",
+          message: promptMessage,
+          choices: sortedCommits.map((commit) => ({
+            title: commit.lessonId,
+            value: commit.lessonId,
+            description: commit.message
+          })),
+          suggest: async (input, choices) => {
+            return choices.filter((choice6) => {
+              const searchText = `${choice6.title} ${choice6.description}`;
+              return searchText.toLowerCase().includes(input.toLowerCase());
+            });
+          }
+        }
+      ])
+    );
+    selectedLessonId = lesson;
+  }
+  const matchingCommits = commits.filter(
+    (commit) => commit.lessonId === selectedLessonId
+  );
+  if (matchingCommits.length === 0) {
+    return yield* new CommitNotFoundError({
+      lessonId: selectedLessonId,
+      branch
+    });
+  }
+  const targetCommit = matchingCommits[matchingCommits.length - 1];
+  yield* Console_exports.log(
+    `Found commit: ${targetCommit.sha} ${targetCommit.message}`
+  );
+  return {
+    commit: targetCommit,
+    lessonId: selectedLessonId
+  };
+});
+var getParentCommit = ({
+  commitSha,
+  cwd
+}) => Effect_exports.gen(function* () {
+  const gitRevParseCommand = Command_exports.make(
+    "git",
+    "rev-parse",
+    `${commitSha}^`
+  ).pipe(Command_exports.workingDirectory(cwd));
+  const parentSha = yield* Command_exports.string(
+    gitRevParseCommand
+  ).pipe(
+    Effect_exports.mapError(() => new NoParentCommitError({ commitSha }))
+  );
+  return parentSha.trim();
+});
+
+// src/cherry-pick.ts
+var NotAGitRepoError = class extends Data_exports.TaggedError(
+  "NotAGitRepoError"
+) {
+};
+var InvalidBranchOperationError = class extends Data_exports.TaggedError(
+  "InvalidBranchOperationError"
+) {
+};
 var cherryPick = Command_exports2.make(
   "cherry-pick",
   {
-    lessonId: Args_exports.text({ name: "lesson-id" }),
+    lessonId: Args_exports.text({ name: "lesson-id" }).pipe(
+      Args_exports.optional
+    ),
     branch: Options_exports.text("branch").pipe(
       Options_exports.withDescription(
         "Branch to search for the lesson commit"
@@ -83154,9 +83330,6 @@ var cherryPick = Command_exports2.make(
         })
       );
     }
-    yield* Console_exports.log(
-      `Searching for lesson ${lessonId} on branch ${branch}...`
-    );
     const gitFetchCommand = Command_exports.make(
       "git",
       "fetch",
@@ -83174,45 +83347,34 @@ var cherryPick = Command_exports2.make(
       process.exitCode = 1;
       return;
     }
-    const gitLogCommand = Command_exports.make(
-      "git",
-      "log",
+    const {
+      commit: targetCommit,
+      lessonId: selectedLessonId
+    } = yield* selectLessonCommit({
+      cwd,
       branch,
-      "--oneline"
-    ).pipe(Command_exports.workingDirectory(cwd));
-    const commitHistory = yield* Command_exports.string(gitLogCommand);
-    const commits = commitHistory.trim().split("\n").filter(Boolean).map((line4) => {
-      const [sha, ...messageParts] = line4.split(" ");
-      const message = messageParts.join(" ");
-      const lessonMatch = message.match(
-        /^(\d+)[.-](\d+)[.-](\d+)/
-      );
-      const extractedLessonId = lessonMatch ? `${lessonMatch[1].padStart(
-        2,
-        "0"
-      )}.${lessonMatch[2].padStart(
-        2,
-        "0"
-      )}.${lessonMatch[3].padStart(2, "0")}` : null;
-      return {
-        sha,
-        message,
-        lessonId: extractedLessonId
-      };
+      lessonId,
+      promptMessage: "Which lesson do you want to cherry-pick? (type to search)",
+      excludeCurrentBranch: true
     });
-    const matchingCommits = commits.filter(
-      (commit) => commit.lessonId === lessonId
-    );
-    if (matchingCommits.length === 0) {
-      return yield* new CommitNotFoundError({
-        lessonId,
-        branch
+    const currentBranchCommand = Command_exports.make(
+      "git",
+      "branch",
+      "--show-current"
+    ).pipe(Command_exports.workingDirectory(cwd));
+    const currentBranch = (yield* Command_exports.string(
+      currentBranchCommand
+    )).trim();
+    if (currentBranch === branch) {
+      return yield* new InvalidBranchOperationError({
+        message: `Cannot cherry-pick when on target branch "${branch}"`
+      });
+    }
+    if (currentBranch === "main") {
+      return yield* new InvalidBranchOperationError({
+        message: `Cannot cherry-pick when on "main" branch`
       });
     }
-    const targetCommit = matchingCommits[matchingCommits.length - 1];
-    yield* Console_exports.log(
-      `Found commit: ${targetCommit.sha} ${targetCommit.message}`
-    );
     yield* Console_exports.log(
       `Cherry-picking ${targetCommit.sha} onto current branch...
 `
@@ -83236,7 +83398,7 @@ var cherryPick = Command_exports2.make(
     }
     yield* Console_exports.log(
       `
-\u2713 Successfully cherry-picked lesson ${lessonId}`
+\u2713 Successfully cherry-picked lesson ${selectedLessonId}`
     );
   }).pipe(
     Effect_exports.catchTags({
@@ -83253,6 +83415,18 @@ var cherryPick = Command_exports2.make(
           );
           process.exitCode = 1;
         });
+      },
+      InvalidBranchOperationError: (error4) => {
+        return Effect_exports.gen(function* () {
+          yield* Console_exports.error(`Error: ${error4.message}`);
+          process.exitCode = 1;
+        });
+      },
+      PromptCancelledError: () => {
+        return Effect_exports.gen(function* () {
+          yield* Console_exports.log("Operation cancelled");
+          process.exitCode = 0;
+        });
       }
     }),
     Effect_exports.catchAll((error4) => {
@@ -83269,7 +83443,7 @@ var cherryPick = Command_exports2.make(
 );
 
 // src/exercise.ts
-var import_prompts = __toESM(require_prompts3());
+var import_prompts2 = __toESM(require_prompts3());
 
 // node_modules/.pnpm/@effect+platform-node@0.95.0_@effect+cluster@0.47.0_@effect+platform@0.90.2_effect@3.17_717c1c3b02c892e86f9e65866f1c696c/node_modules/@effect/platform-node/dist/esm/Undici.js
 var Undici_exports = {};
@@ -83505,19 +83679,6 @@ var envFilePathOption = Options_exports.text("env-file").pipe(
 );
 
 // src/exercise.ts
-var PromptCancelledError = class extends Data_exports.TaggedError(
-  "PromptCancelledError"
-) {
-};
-var runPrompt = (prompt6) => {
-  return Effect_exports.gen(function* () {
-    const result = yield* Effect_exports.promise(() => prompt6());
-    if (!result) {
-      return yield* new PromptCancelledError();
-    }
-    return result;
-  });
-};
 var LessonNotFoundError = class extends Data_exports.TaggedError(
   "LessonNotFoundError"
 ) {
@@ -83650,7 +83811,7 @@ var runLesson = Effect_exports.fn("runLesson")(function* (opts) {
     lowercase: "exercise"
   };
   const { choice: choice6 } = yield* runPrompt(
-    () => (0, import_prompts.default)([
+    () => (0, import_prompts2.default)([
       {
         type: "select",
         name: "choice",
@@ -83739,7 +83900,7 @@ var chooseLessonAndRunIt = (opts) => Effect_exports.gen(function* () {
   );
   yield* Console_exports.clear;
   const { lesson: lessonNumber } = yield* runPrompt(
-    () => (0, import_prompts.default)([
+    () => (0, import_prompts2.default)([
       {
         type: "autocomplete",
         name: "lesson",
@@ -83839,7 +84000,7 @@ var selectSubfolderIndex = Effect_exports.fn("selectSubfolder")(
       });
     }
     const result = yield* runPrompt(
-      () => (0, import_prompts.default)([
+      () => (0, import_prompts2.default)([
         {
           type: "select",
           name: "subfolderIndex",
@@ -84511,10 +84672,10 @@ var MissingExerciseFolderError = class extends Data_exports.TaggedError(
   "DiffGenerationError"
 ) {
 });
-var DirtyWorkingTreeError = class extends Data_exports.TaggedError(
+(class extends Data_exports.TaggedError(
   "DirtyWorkingTreeError"
 ) {
-};
+});
 var NoExerciseFoundError = class extends Data_exports.TaggedError(
   "NoExerciseFoundError"
 ) {
@@ -84528,9 +84689,7 @@ var getDiffs = Command_exports2.make(
       )
     ),
     branch: Options_exports.text("branch").pipe(
-      Options_exports.withDescription(
-        "Branch to checkout before getting diffs"
-      )
+      Options_exports.withDescription("Branch to get diffs from")
     ),
     root: Options_exports.text("root").pipe(
       Options_exports.withDescription(
@@ -84558,39 +84717,24 @@ var getDiffs = Command_exports2.make(
         })
       );
     }
-    const gitStatusCommand = Command_exports.make(
-      "git",
-      "status",
-      "--porcelain"
-    ).pipe(Command_exports.workingDirectory(projectRepo));
-    const statusOutput = yield* Command_exports.string(
-      gitStatusCommand
-    );
-    if (statusOutput.trim() !== "") {
-      return yield* Effect_exports.fail(
-        new DirtyWorkingTreeError({
-          path: projectRepo,
-          message: `Working tree has uncommitted changes. Commit or stash changes before running get-diffs`
-        })
-      );
-    }
-    const gitCheckoutCommand = Command_exports.make(
+    yield* Console_exports.log("Fetching latest from origin...");
+    const gitFetchCommand = Command_exports.make(
       "git",
-      "checkout",
-      branch
+      "fetch",
+      "origin"
     ).pipe(Command_exports.workingDirectory(projectRepo));
-    const checkoutExitCode = yield* Command_exports.exitCode(
-      gitCheckoutCommand
+    const fetchExitCode = yield* Command_exports.exitCode(
+      gitFetchCommand
     ).pipe(Effect_exports.catchAll(() => Effect_exports.succeed(1)));
-    if (checkoutExitCode !== 0) {
+    if (fetchExitCode !== 0) {
       return yield* Effect_exports.fail(
         new InvalidProjectRepoError({
           path: projectRepo,
-          message: `Failed to checkout branch: ${branch}`
+          message: `Failed to fetch from origin`
         })
       );
     }
-    yield* Console_exports.log(`\u2713 Checked out branch: ${branch}`);
+    yield* Console_exports.log(`\u2713 Fetched latest from origin`);
     yield* Console_exports.log(
       `\u2713 Validated project repo: ${projectRepo}`
     );
@@ -84602,7 +84746,7 @@ var getDiffs = Command_exports2.make(
       "--oneline",
       "--reverse",
       // Chronological order (oldest first)
-      "--all"
+      branch
     ).pipe(Command_exports.workingDirectory(projectRepo));
     const commitHistory = yield* Command_exports.string(gitLogCommand);
     const commits = commitHistory.trim().split("\n").filter(Boolean).map((line4) => {
@@ -84802,12 +84946,6 @@ var getDiffs = Command_exports2.make(
           process.exitCode = 1;
         });
       },
-      DirtyWorkingTreeError: (error4) => {
-        return Effect_exports.gen(function* () {
-          yield* Console_exports.error(`Error: ${error4.message}`);
-          process.exitCode = 1;
-        });
-      },
       NoExerciseFoundError: (error4) => {
         return Effect_exports.gen(function* () {
           yield* Console_exports.error(
@@ -84887,39 +85025,43 @@ var internal = Command_exports2.make("internal").pipe(
 );
 
 // src/reset.ts
-var import_prompts2 = __toESM(require_prompts3());
+var import_prompts3 = __toESM(require_prompts3());
 var NotAGitRepoError2 = class extends Data_exports.TaggedError(
   "NotAGitRepoError"
 ) {
 };
-var CommitNotFoundError2 = class extends Data_exports.TaggedError(
-  "CommitNotFoundError"
-) {
-};
-var PromptCancelledError2 = class extends Data_exports.TaggedError(
-  "PromptCancelledError"
+var InvalidBranchOperationError2 = class extends Data_exports.TaggedError(
+  "InvalidBranchOperationError"
 ) {
 };
-var runPrompt2 = (promptFn) => {
-  return Effect_exports.gen(function* () {
-    const result = yield* Effect_exports.promise(() => promptFn());
-    if (!result) {
-      return yield* new PromptCancelledError2();
-    }
-    return result;
-  });
-};
 var reset2 = Command_exports2.make(
   "reset",
   {
-    lessonId: Args_exports.text({ name: "lesson-id" }),
+    lessonId: Args_exports.text({ name: "lesson-id" }).pipe(
+      Args_exports.optional
+    ),
     branch: Options_exports.text("branch").pipe(
       Options_exports.withDescription(
         "Branch to search for the lesson commit"
       )
+    ),
+    problem: Options_exports.boolean("problem").pipe(
+      Options_exports.withAlias("p"),
+      Options_exports.withDescription(
+        "Reset to problem state (start the exercise)"
+      )
+    ),
+    solution: Options_exports.boolean("solution").pipe(
+      Options_exports.withAlias("s"),
+      Options_exports.withDescription(
+        "Reset to solution state (final code)"
+      )
+    ),
+    demo: Options_exports.boolean("demo").pipe(
+      Options_exports.withAlias("d")
     )
   },
-  ({ branch, lessonId }) => Effect_exports.gen(function* () {
+  ({ branch, demo, lessonId, problem, solution }) => Effect_exports.gen(function* () {
     const cwd = process.cwd();
     const gitDirPath = path5__namespace.join(cwd, ".git");
     if (!NFS.existsSync(gitDirPath)) {
@@ -84947,70 +85089,116 @@ var reset2 = Command_exports2.make(
       process.exitCode = 1;
       return;
     }
-    yield* Console_exports.log(
-      `Searching for lesson ${lessonId} on branch ${branch}...`
-    );
-    const gitLogCommand = Command_exports.make(
-      "git",
-      "log",
+    const {
+      commit: targetCommit,
+      lessonId: selectedLessonId
+    } = yield* selectLessonCommit({
+      cwd,
       branch,
-      "--oneline"
-    ).pipe(Command_exports.workingDirectory(cwd));
-    const commitHistory = yield* Command_exports.string(gitLogCommand);
-    const commits = commitHistory.trim().split("\n").filter(Boolean).map((line4) => {
-      const [sha, ...messageParts] = line4.split(" ");
-      const message = messageParts.join(" ");
-      const lessonMatch = message.match(
-        /^(\d+)[.-](\d+)[.-](\d+) /
-      );
-      const extractedLessonId = lessonMatch ? `${lessonMatch[1].padStart(
-        2,
-        "0"
-      )}.${lessonMatch[2].padStart(
-        2,
-        "0"
-      )}.${lessonMatch[3].padStart(2, "0")}` : null;
-      return {
-        sha,
-        message,
-        lessonId: extractedLessonId
-      };
+      lessonId,
+      promptMessage: "Which lesson do you want to reset to? (type to search)",
+      excludeCurrentBranch: false
     });
-    const matchingCommits = commits.filter(
-      (commit) => commit.lessonId === lessonId
-    );
-    if (matchingCommits.length === 0) {
-      return yield* new CommitNotFoundError2({
-        lessonId,
-        branch
+    let commitToUse = targetCommit.sha;
+    let stateDescription = "final code";
+    if (problem && solution) {
+      return yield* Effect_exports.fail(
+        new InvalidBranchOperationError2({
+          message: "Cannot use both --problem and --solution flags"
+        })
+      );
+    }
+    if (demo && (problem || solution)) {
+      return yield* Effect_exports.fail(
+        new InvalidBranchOperationError2({
+          message: "Cannot use --demo with --problem or --solution flags"
+        })
+      );
+    }
+    if (!problem && !solution && !demo) {
+      const { state } = yield* runPrompt(
+        () => (0, import_prompts3.default)([
+          {
+            type: "select",
+            name: "state",
+            message: "Start the exercise or view final code?",
+            choices: [
+              {
+                title: "Start the exercise",
+                value: "problem",
+                description: "Reset to problem state (commit before solution)"
+              },
+              {
+                title: "Final code",
+                value: "solution",
+                description: "Reset to solution state (completed exercise)"
+              }
+            ]
+          }
+        ])
+      );
+      if (state === "problem") {
+        commitToUse = yield* getParentCommit({
+          commitSha: targetCommit.sha,
+          cwd
+        });
+        stateDescription = "problem state";
+      }
+    } else if (problem) {
+      commitToUse = yield* getParentCommit({
+        commitSha: targetCommit.sha,
+        cwd
       });
+      stateDescription = "problem state";
+    }
+    const currentBranchCommand = Command_exports.make(
+      "git",
+      "branch",
+      "--show-current"
+    ).pipe(Command_exports.workingDirectory(cwd));
+    const currentBranch = (yield* Command_exports.string(
+      currentBranchCommand
+    )).trim();
+    let action;
+    if (demo) {
+      action = "reset-current";
+    } else {
+      const result = yield* runPrompt(
+        () => (0, import_prompts3.default)([
+          {
+            type: "select",
+            name: "action",
+            message: "How would you like to proceed?",
+            choices: [
+              {
+                title: `Reset current branch (${currentBranch})`,
+                value: "reset-current"
+              },
+              {
+                title: "Create new branch from commit",
+                value: "create-branch"
+              }
+            ]
+          }
+        ])
+      );
+      action = result.action;
+    }
+    if (action === "reset-current") {
+      if (currentBranch === branch) {
+        return yield* new InvalidBranchOperationError2({
+          message: `Cannot reset current branch when on target branch "${branch}"`
+        });
+      }
+      if (currentBranch === "main") {
+        return yield* new InvalidBranchOperationError2({
+          message: `Cannot reset current branch when on "main" branch`
+        });
+      }
     }
-    const targetCommit = matchingCommits[matchingCommits.length - 1];
-    yield* Console_exports.log(
-      `Found commit: ${targetCommit.sha} ${targetCommit.message}`
-    );
-    const { action } = yield* runPrompt2(
-      () => (0, import_prompts2.default)([
-        {
-          type: "select",
-          name: "action",
-          message: "How would you like to proceed?",
-          choices: [
-            {
-              title: "Reset current branch",
-              value: "reset-current"
-            },
-            {
-              title: "Create new branch from commit",
-              value: "create-branch"
-            }
-          ]
-        }
-      ])
-    );
     if (action === "create-branch") {
-      const { branchName } = yield* runPrompt2(
-        () => (0, import_prompts2.default)([
+      const { branchName } = yield* runPrompt(
+        () => (0, import_prompts3.default)([
           {
             type: "text",
             name: "branchName",
@@ -85019,14 +85207,14 @@ var reset2 = Command_exports2.make(
         ])
       );
       yield* Console_exports.log(
-        `Creating branch ${branchName} from ${targetCommit.sha}...`
+        `Creating branch ${branchName} from ${commitToUse} (${stateDescription})...`
       );
       const createBranchCommand = Command_exports.make(
         "git",
         "checkout",
         "-b",
         branchName,
-        targetCommit.sha
+        commitToUse
       ).pipe(
         Command_exports.workingDirectory(cwd),
         Command_exports.stdout("inherit"),
@@ -85045,40 +85233,44 @@ var reset2 = Command_exports2.make(
       );
       return;
     }
-    const gitStatusCommand = Command_exports.make(
-      "git",
-      "status",
-      "--porcelain"
-    ).pipe(Command_exports.workingDirectory(cwd));
-    const statusOutput = yield* Command_exports.string(
-      gitStatusCommand
-    );
-    if (statusOutput.trim() !== "") {
-      yield* Console_exports.log(
-        "\nWarning: You have uncommitted changes:"
-      );
-      yield* Console_exports.log(statusOutput);
-      const { confirm } = yield* runPrompt2(
-        () => (0, import_prompts2.default)([
-          {
-            type: "confirm",
-            name: "confirm",
-            message: "This will lose all uncommitted work. Continue?",
-            initial: false
-          }
-        ])
+    if (!demo) {
+      const gitStatusCommand = Command_exports.make(
+        "git",
+        "status",
+        "--porcelain"
+      ).pipe(Command_exports.workingDirectory(cwd));
+      const statusOutput = yield* Command_exports.string(
+        gitStatusCommand
       );
-      if (!confirm) {
-        yield* Console_exports.log("Reset cancelled");
-        return;
+      if (statusOutput.trim() !== "") {
+        yield* Console_exports.log(
+          "\nWarning: You have uncommitted changes:"
+        );
+        yield* Console_exports.log(statusOutput);
+        const { confirm } = yield* runPrompt(
+          () => (0, import_prompts3.default)([
+            {
+              type: "confirm",
+              name: "confirm",
+              message: "This will lose all uncommitted work. Continue?",
+              initial: false
+            }
+          ])
+        );
+        if (!confirm) {
+          yield* Console_exports.log("Reset cancelled");
+          return;
+        }
       }
     }
-    yield* Console_exports.log(`Resetting to ${targetCommit.sha}...`);
+    yield* Console_exports.log(
+      `Resetting to ${commitToUse} (${stateDescription})...`
+    );
     const resetCommand = Command_exports.make(
       "git",
       "reset",
       "--hard",
-      targetCommit.sha
+      commitToUse
     ).pipe(
       Command_exports.workingDirectory(cwd),
       Command_exports.stdout("inherit"),
@@ -85092,9 +85284,61 @@ var reset2 = Command_exports2.make(
       process.exitCode = 1;
       return;
     }
-    yield* Console_exports.log(`\u2713 Reset to lesson ${lessonId}`);
+    if (demo) {
+      yield* Console_exports.log("Undoing commit and unstaging changes...");
+      const undoCommand = Command_exports.make(
+        "git",
+        "reset",
+        "HEAD^"
+      ).pipe(
+        Command_exports.workingDirectory(cwd),
+        Command_exports.stdout("inherit"),
+        Command_exports.stderr("inherit")
+      );
+      const undoExitCode = yield* Command_exports.exitCode(
+        undoCommand
+      ).pipe(Effect_exports.catchAll(() => Effect_exports.succeed(1)));
+      if (undoExitCode !== 0) {
+        yield* Console_exports.error("Failed to undo commit");
+        process.exitCode = 1;
+        return;
+      }
+      const unstageCommand = Command_exports.make(
+        "git",
+        "restore",
+        "--staged",
+        "."
+      ).pipe(
+        Command_exports.workingDirectory(cwd),
+        Command_exports.stdout("inherit"),
+        Command_exports.stderr("inherit")
+      );
+      const unstageExitCode = yield* Command_exports.exitCode(
+        unstageCommand
+      ).pipe(Effect_exports.catchAll(() => Effect_exports.succeed(1)));
+      if (unstageExitCode !== 0) {
+        yield* Console_exports.error("Failed to unstage changes");
+        process.exitCode = 1;
+        return;
+      }
+      yield* Console_exports.log(
+        `\u2713 Demo mode: Reset to lesson ${selectedLessonId} with unstaged changes`
+      );
+    } else {
+      yield* Console_exports.log(
+        `\u2713 Reset to lesson ${selectedLessonId} (${stateDescription})`
+      );
+    }
   }).pipe(
     Effect_exports.catchTags({
+      NoParentCommitError: (error4) => {
+        return Effect_exports.gen(function* () {
+          yield* Console_exports.error(
+            `Error: Commit ${error4.commitSha} has no parent commit. Repository may be in an invalid state.`
+          );
+          process.exitCode = 1;
+        });
+      },
       NotAGitRepoError: (error4) => {
         return Effect_exports.gen(function* () {
           yield* Console_exports.error(`Error: ${error4.message}`);
@@ -85114,6 +85358,12 @@ var reset2 = Command_exports2.make(
           yield* Console_exports.log("Operation cancelled");
           process.exitCode = 0;
         });
+      },
+      InvalidBranchOperationError: (error4) => {
+        return Effect_exports.gen(function* () {
+          yield* Console_exports.error(`Error: ${error4.message}`);
+          process.exitCode = 1;
+        });
       }
     }),
     Effect_exports.catchAll((error4) => {

package/package.json

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