@polka-codes/cli 0.9.50 → 0.9.51

package/dist/index.js

@@ -35579,7 +35579,7 @@ var {
   Help
 } = import__.default;
 // package.json
-var version = "0.9.50";
+var version = "0.9.51";
 
 // src/commands/code.ts
 import { readFile as readFile3 } from "node:fs/promises";
@@ -79038,27 +79038,78 @@ Branch names should:
 
 ## Response Format
 
-${createJsonResponseInstruction({
-  plan: "The generated or updated plan.",
-  branchName: "feat/new-feature-name",
-  question: {
-    question: "The clarifying question to ask the user.",
-    defaultAnswer: "The default answer to provide if the user does not provide an answer."
-  },
-  reason: "If no plan is needed, provide a reason here."
-})}
+Respond with a JSON object in a markdown code block. The JSON object should have a "type" field that determines the structure of the rest of the object.
+
+### 1. When you generate a plan (type: 'plan-generated')
+- **type**: Must be "plan-generated".
+- **plan**: The generated or updated plan.
+- **branchName**: A suitable git branch name for the work.
+
+Example:
+\`\`\`json
+{
+  "type": "plan-generated",
+  "plan": "1. Phase 1: Backend API Development\\n   - [ ] Design and implement user authentication endpoints...",
+  "branchName": "feat/user-authentication"
+}
+\`\`\`
+
+### 2. When you need to ask a question (type: 'question')
+- **type**: Must be "question".
+- **question**: An object containing the question and an optional default answer.
+
+Example:
+\`\`\`json
+{
+  "type": "question",
+  "question": {
+    "question": "What database are you using?",
+    "defaultAnswer": "PostgreSQL"
+  }
+}
+\`\`\`
+
+### 3. When no plan is needed or an error occurs (type: 'error')
+- **type**: Must be "error".
+- **reason**: A string explaining why no plan is generated (e.g., task already complete, unclear requirements after questioning).
+
+Example:
+\`\`\`json
+{
+  "type": "error",
+  "reason": "The requested feature is already implemented in 'src/features/existing-feature.ts'."
+}
+\`\`\`
 `;
 var BRANCH_NAME_PATTERN = /^[a-zA-Z0-9/_-]+$/;
 var EpicPlanSchema = exports_external.object({
+  type: exports_external.enum(["plan-generated", "question", "error"]),
   plan: exports_external.string().nullish(),
   branchName: exports_external.string().refine((name18) => name18.length >= 3, { message: "Branch name is too short (min 3 characters)." }).refine((name18) => name18.length <= 255, { message: "Branch name is too long (max 255 characters)." }).refine((name18) => BRANCH_NAME_PATTERN.test(name18), {
     message: "Invalid branch name format. Branch names should contain only letters, numbers, hyphens, underscores, and forward slashes."
-  }),
+  }).nullish(),
   question: exports_external.object({
     question: exports_external.string(),
     defaultAnswer: exports_external.string().nullish()
   }).nullish(),
   reason: exports_external.string().nullish()
+}).superRefine((data, ctx) => {
+  if (data.type === "plan-generated") {
+    if (!data.plan || data.plan.trim() === "") {
+      ctx.addIssue({
+        code: "custom",
+        message: 'Plan is required when type is "plan-generated".',
+        path: ["plan"]
+      });
+    }
+    if (!data.branchName || data.branchName.trim() === "") {
+      ctx.addIssue({
+        code: "custom",
+        message: 'Branch name is required when type is "plan-generated".',
+        path: ["branchName"]
+      });
+    }
+  }
 });
 function getPlanPrompt(task, planContent) {
   const planSection = planContent ? `
@@ -79832,8 +79883,8 @@ Files:`);
 
 // src/workflows/code.workflow.ts
 var ImplementOutputSchema = exports_external.object({
-  summary: exports_external.string().nullish(),
-  bailReason: exports_external.string().nullish()
+  summary: exports_external.string().nullish().describe("Short summary of the changes made"),
+  bailReason: exports_external.string().nullish().describe("Reason for bailing out of the implementation loop")
 }).refine((data) => data.summary != null !== (data.bailReason != null), {
   message: "Either summary or bailReason must be provided, but not both"
 });
@@ -80383,6 +80434,7 @@ var EpicContextSchema = exports_external.object({
   task: exports_external.string().nullish(),
   plan: exports_external.string().nullish(),
   branchName: exports_external.string().nullish(),
+  baseBranch: exports_external.string().nullish(),
   todos: exports_external.array(TodoItemSchema).nullish(),
   memory: exports_external.record(exports_external.string(), exports_external.string()).nullish()
 });
@@ -80482,48 +80534,57 @@ ${feedback}`
     outputSchema: EpicPlanSchema
   }, context);
   if (planResult.type === "Exit" /* Exit */) {
-    return { ...planResult.object, type: planResult.type };
+    return planResult.object;
   }
-  return { plan: "", reason: "Usage limit exceeded.", type: "Exit" /* Exit */, branchName: "" };
+  return { type: "error", reason: "Usage limit exceeded." };
 }
 async function createAndApprovePlan(task, context) {
   const { logger, step, tools: tools2 } = context;
   logger.info(`Phase 2: Creating high-level plan...
 `);
   let feedback;
-  let highLevelPlan;
-  let branchName;
   let planAttempt = 1;
   try {
     while (true) {
       const result = await step(`plan-${planAttempt}`, () => createPlan2({ task, feedback }, context));
       planAttempt++;
-      if (result.question) {
-        const answer = await tools2.input({
-          message: result.question.question,
-          default: result.question.defaultAnswer || undefined
-        });
-        feedback = `The user answered the question "${result.question.question}" with: "${answer}"`;
-        continue;
-      }
-      if (!result.plan) {
-        if (result.reason) {
-          logger.info(`No plan created. Reason: ${result.reason}`);
-        } else {
-          logger.info("No plan created.");
-        }
-        return null;
-      }
-      logger.info(`Plan:
+      switch (result.type) {
+        case "plan-generated": {
+          if (!result.plan || !result.branchName) {
+            logger.error("Invalid plan-generated response. Missing plan or branchName.");
+            return null;
+          }
+          logger.info(`Plan:
 ${result.plan}`);
-      if (result.branchName) {
-        logger.info(`Suggested branch name: ${result.branchName}`);
-      }
-      feedback = await tools2.input({ message: "Press Enter to approve the plan, or provide feedback to refine it." });
-      if (feedback.trim() === "") {
-        highLevelPlan = result.plan;
-        branchName = result.branchName;
-        break;
+          logger.info(`Suggested branch name: ${result.branchName}`);
+          feedback = await tools2.input({ message: "Press Enter to approve the plan, or provide feedback to refine it." });
+          if (feedback.trim() === "") {
+            logger.info(`High-level plan approved.
+`);
+            return { plan: result.plan, branchName: result.branchName };
+          }
+          break;
+        }
+        case "question": {
+          if (!result.question) {
+            logger.error("Invalid question response. Missing question object.");
+            return null;
+          }
+          const answer = await tools2.input({
+            message: result.question.question,
+            default: result.question.defaultAnswer || undefined
+          });
+          feedback = `The user answered the question "${result.question.question}" with: "${answer}"`;
+          break;
+        }
+        case "error": {
+          logger.info(`Plan creation failed. Reason: ${result.reason || "Unknown error"}`);
+          return null;
+        }
+        default: {
+          logger.error(`Unknown response type from planner: ${result.type}`);
+          return null;
+        }
       }
     }
   } catch (e) {
@@ -80533,19 +80594,8 @@ ${result.plan}`);
     }
     throw e;
   }
-  if (!highLevelPlan) {
-    logger.info("Plan not approved. Exiting.");
-    return null;
-  }
-  if (!branchName) {
-    logger.error("Error: No branch name was generated from the plan. Exiting.");
-    return null;
-  }
-  logger.info(`High-level plan approved.
-`);
-  return { plan: highLevelPlan, branchName };
 }
-async function createFeatureBranch(branchName, context) {
+async function createFeatureBranch(branchName, baseBranch, context) {
   const { logger, step, tools: tools2 } = context;
   logger.info(`Phase 3: Creating/switching to feature branch...
 `);
@@ -80565,7 +80615,10 @@ async function createFeatureBranch(branchName, context) {
     }
   } else {
     logger.info(`Creating new branch '${branchName}'...`);
-    const createBranchResult = await step("createBranch", async () => await tools2.executeCommand({ command: "git", args: ["checkout", "-b", branchName] }));
+    const createBranchResult = await step("createBranch", async () => await tools2.executeCommand({
+      command: "git",
+      args: baseBranch ? ["checkout", "-b", branchName, baseBranch] : ["checkout", "-b", branchName]
+    }));
     if (createBranchResult.exitCode !== 0) {
       logger.error(`Error: Failed to create branch '${branchName}'. Git command failed.`);
       return { success: false, branchName: null };
@@ -80604,12 +80657,13 @@ async function runPreflightChecks(epicContext, context) {
   }
   if (epicContext.plan) {
     logger.info("Found an existing `.epic.yml` file.");
-    if (epicContext.branchName) {
-      const currentBranchResult = await step("getCurrentBranch", async () => tools2.executeCommand({ command: "git", args: ["rev-parse", "--abbrev-ref", "HEAD"] }));
-      const currentBranch = currentBranchResult.stdout.trim();
-      if (currentBranch !== epicContext.branchName) {
-        throw new Error(`You are on branch '${currentBranch}' but the epic was started on branch '${epicContext.branchName}'. Please switch to the correct branch to resume.`);
-      }
+    if (!epicContext.branchName) {
+      throw new Error("Invalid epic context loaded from .epic.yml: branchName is required.");
+    }
+    const currentBranchResult = await step("getCurrentBranch", async () => tools2.executeCommand({ command: "git", args: ["rev-parse", "--abbrev-ref", "HEAD"] }));
+    const currentBranch = currentBranchResult.stdout.trim();
+    if (currentBranch !== epicContext.branchName) {
+      throw new Error(`You are on branch '${currentBranch}' but the epic was started on branch '${epicContext.branchName}'. Please switch to the correct branch to resume.`);
     }
     logger.info("Resuming previous epic session.");
     return true;
@@ -80620,6 +80674,11 @@ async function runPreflightChecks(epicContext, context) {
     logger.info("Suggestion: Run `git add .` and `git commit` to clean your working directory, or `git stash` to temporarily save changes.\n");
     return false;
   }
+  const baseBranchResult = await step("getBaseBranch", async () => tools2.executeCommand({ command: "git", args: ["rev-parse", "--abbrev-ref", "HEAD"] }));
+  if (baseBranchResult.exitCode === 0 && baseBranchResult.stdout.trim()) {
+    epicContext.baseBranch = baseBranchResult.stdout.trim();
+    logger.info(`Using current branch '${epicContext.baseBranch}' as the base for this epic.`);
+  }
   logger.info(`Pre-flight checks passed.
 `);
   return true;
@@ -80812,28 +80871,22 @@ Progress: ${progressMessage}`);
   }
   return commitMessages;
 }
-async function performFinalReviewAndFix(context, highLevelPlan) {
+async function performFinalReviewAndFix(context, highLevelPlan, baseBranch) {
   const { logger, step, tools: tools2 } = context;
   logger.info(`
 Phase 6: Final Review and Fixup...
 `);
-  const ghCheckResult = await tools2.executeCommand({ command: "gh", args: ["--version"] });
-  if (ghCheckResult.exitCode !== 0) {
-    logger.warn("Warning: GitHub CLI (gh) is not installed. Skipping final review step. Please install it from https://cli.github.com/ to enable final reviews.");
+  if (!baseBranch) {
+    logger.warn("Warning: Base branch is not defined. Skipping final review step.");
     return { passed: true };
   }
-  const defaultBranchResult = await tools2.executeCommand({
-    command: "gh",
-    args: ["repo", "view", "--json", "defaultBranchRef", "--jq", ".defaultBranchRef.name"]
-  });
-  const defaultBranch = defaultBranchResult.stdout.trim();
   const currentBranchResult = await tools2.executeCommand({ command: "git", args: ["rev-parse", "--abbrev-ref", "HEAD"] });
   const currentBranch = currentBranchResult.stdout.trim();
-  if (currentBranch === defaultBranch) {
-    logger.info(`You are on the default branch ('${defaultBranch}'). No final review needed.`);
+  if (currentBranch === baseBranch) {
+    logger.info(`You are on the base branch ('${baseBranch}'). No final review needed.`);
     return { passed: true };
   }
-  const commitRange = `${defaultBranch}...${currentBranch}`;
+  const commitRange = `${baseBranch}...${currentBranch}`;
   for (let i = 0;i < MAX_REVIEW_RETRIES; i++) {
     const diffResult = await tools2.executeCommand({ command: "git", args: ["diff", "--name-status", commitRange] });
     const changedFiles = parseGitDiffNameStatus(diffResult.stdout);
@@ -80913,9 +80966,9 @@ Max retries (${MAX_REVIEW_RETRIES}) reached for final review. Issues might remai
   }
   return { passed: false };
 }
-var epicWorkflow = async (input2, context) => {
+var epicWorkflow = async (epicContext, context) => {
   const { logger, tools: tools2 } = context;
-  const { task, epicContext = {} } = input2;
+  const { task } = epicContext;
   const workflowStartTime = Date.now();
   if (!task || task.trim() === "") {
     logger.error("Error: Task cannot be empty. Please provide a valid task description.");
@@ -80949,7 +81002,7 @@ var epicWorkflow = async (input2, context) => {
       logger.error("Error: Branch name is missing after planning phase. Exiting.");
       return;
     }
-    const branchResult = await createFeatureBranch(epicContext.branchName, context);
+    const branchResult = await createFeatureBranch(epicContext.branchName, epicContext.baseBranch ?? undefined, context);
     if (!branchResult.success || !branchResult.branchName)
       return;
     if (epicContext.branchName !== branchResult.branchName) {
@@ -80961,7 +81014,7 @@ var epicWorkflow = async (input2, context) => {
       await addTodoItemsFromPlan(epicContext.plan, context);
     }
     const commitMessages = await runImplementationLoop(context, epicContext.plan);
-    await performFinalReviewAndFix(context, epicContext.plan);
+    await performFinalReviewAndFix(context, epicContext.plan, epicContext.baseBranch ?? undefined);
     await tools2.executeCommand({ command: "git", args: ["rm", "-f", ".epic.yml"] });
     const statusResult = await tools2.executeCommand({
       command: "git",
@@ -81284,33 +81337,40 @@ var commitCommand = new Command("commit").description("Create a commit with AI-g
 
 // src/commands/epic.ts
 async function runEpic(task2, _options, command) {
-  let taskInput = task2;
-  if (!taskInput) {
-    taskInput = await getUserInput("What epic or large feature do you want to implement?");
-    if (!taskInput) {
-      return;
-    }
-  }
-  if (!taskInput) {
-    console.error("No task provided. Aborting.");
-    return;
-  }
-  const ctx = await loadEpicContext();
-  const workflowInput = {
-    task: taskInput,
-    epicContext: ctx
-  };
   const globalOpts = (command.parent ?? command).opts();
   const { verbose, yes } = globalOpts;
   const logger = createLogger({
     verbose
   });
-  await runWorkflow(epicWorkflow, workflowInput, {
+  let taskInput = task2;
+  const epicContext = await loadEpicContext();
+  if (epicContext.task) {
+    if (taskInput) {
+      logger.error("Error: Existing epic context found, but task was provided via CLI args. Exiting.");
+      return;
+    }
+    logger.info("Resuming existing epic session. Task:");
+    logger.info(`   ${epicContext.task}`);
+  } else {
+    if (!taskInput) {
+      taskInput = await getUserInput("What feature do you want to implement?");
+      if (!taskInput) {
+        logger.info("No task provided. Exiting.");
+        return;
+      }
+    }
+    epicContext.task = taskInput;
+  }
+  await runWorkflow(epicWorkflow, epicContext, {
     commandName: "epic",
     command,
     logger,
     yes,
-    getProvider: (opt) => getProvider({ ...opt, todoItemStore: new EpicTodoItemStore(ctx), memoryStore: new EpicMemoryStore(ctx) })
+    getProvider: (opt) => getProvider({
+      ...opt,
+      todoItemStore: new EpicTodoItemStore(epicContext),
+      memoryStore: new EpicMemoryStore(epicContext)
+    })
   });
 }
 var epicCommand = new Command("epic").description("Orchestrates a large feature or epic, breaking it down into smaller tasks.").argument("[task]", "The epic to plan and implement.").action(runEpic);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polka-codes/cli",
-  "version": "0.9.50",
+  "version": "0.9.51",
   "license": "AGPL-3.0",
   "author": "github@polka.codes",
   "type": "module",