vibeman 0.0.10 → 0.0.11

package/dist/api.js

@@ -19058,7 +19058,7 @@ Gate rule: if the score is below 70, the review is considered failed. Set vibema
         type: "coding_agent",
         config: {
           model: DEFAULT_MODEL,
-          agentThreadOptions: { modelReasoningEffort: "xhigh" },
+          agentThreadOptions: { modelReasoningEffort: "medium" },
           systemPrompt: "You are a senior engineer working inside this repository.",
           prompt: `Merge the feature branch into the default branch.
 
@@ -19069,9 +19069,14 @@ Gate rule: if the score is below 70, the review is considered failed. Set vibema
 - worktreePath: {{runPayload.worktreePath}}
 - repoRoot: {{runPayload.repoRoot}}
 
+## Execution Strategy
+- Keep this run deterministic and fast: do not run exploratory commands unless a step fails unexpectedly.
+- Prefer direct execution of the steps below, in order.
+- On conflict, prioritize correctness over speed and produce explicit conflict-file reporting.
+
 ## Commands
 
-### Step 1: Fetch
+### Step 1: Fetch (non-blocking)
 \`\`\`
 git -C "{{runPayload.worktreePath}}" fetch origin || true
 \`\`\`
@@ -19084,24 +19089,50 @@ git -C "{{runPayload.worktreePath}}" symbolic-ref refs/remotes/origin/HEAD | sed
 \`\`\`
 Fallback to "main" if detection fails.
 
-### Step 3: Try fast-forward merge in repoRoot
-The defaultBranch (e.g. main) is typically checked out at repoRoot, not worktreePath. Run the merge there:
+### Step 3: Fast path merge in repoRoot
+The default branch (e.g. main) is typically checked out at repoRoot, not worktreePath.
+
+Attempt fast-forward merge directly:
 \`\`\`
 git -C "{{runPayload.repoRoot}}" merge --ff-only {{runPayload.branchName}}
 \`\`\`
-If this succeeds, skip to Step 5.
+If this fails because local uncommitted changes would be overwritten:
+1. Create a temporary stash in repoRoot (non-destructive):
+\`\`\`
+git -C "{{runPayload.repoRoot}}" stash push -u -m "temp-merge-{{runPayload.branchName}}"
+\`\`\`
+2. Retry the same fast-forward merge command once.
+If merge succeeds, skip to Step 5.
 
-### Step 4: Rebase and retry (only if Step 3 failed)
-Fast-forward failed, so rebase the feature branch onto the default branch first:
+### Step 4: Rebase feature branch and retry merge (only if Step 3 still failed)
+Rebase the feature branch onto local <defaultBranch> first (not origin/<defaultBranch>, so local commits on defaultBranch are included):
 \`\`\`
 git -C "{{runPayload.worktreePath}}" checkout {{runPayload.branchName}}
-git -C "{{runPayload.worktreePath}}" rebase origin/<defaultBranch>
+git -C "{{runPayload.worktreePath}}" rebase <defaultBranch>
+\`\`\`
+
+If rebase has conflicts:
+1. List conflicted files and resolve conflict markers in each file.
+2. Stage resolved files and continue:
+\`\`\`
+git -C "{{runPayload.worktreePath}}" add <resolved-files>
+git -C "{{runPayload.worktreePath}}" rebase --continue
 \`\`\`
-If rebase has conflicts, resolve them, then \`git rebase --continue\`.
+3. Repeat until rebase is complete.
+4. If conflicts cannot be resolved, run:
+\`\`\`
+git -C "{{runPayload.worktreePath}}" rebase --abort
+\`\`\`
+Then fail the task with:
+- conflicted files
+- exact blockers
+- actionable next commands for manual resolution
+
 After rebase completes, retry the merge in repoRoot:
 \`\`\`
 git -C "{{runPayload.repoRoot}}" merge --ff-only {{runPayload.branchName}}
 \`\`\`
+If this retry fails, report reason and stop.
 
 ### Step 5: Finalize
 On success:
@@ -19110,6 +19141,7 @@ On success:
 3. Delete the feature branch: \`git -C "{{runPayload.repoRoot}}" branch -d {{runPayload.branchName}}\` (branch deletion failure is non-blocking; continue cleanup)
 4. Remove the worktree: \`git -C "{{runPayload.repoRoot}}" worktree remove "{{runPayload.worktreePath}}" --force\`
 5. Prune worktrees: \`git -C "{{runPayload.repoRoot}}" worktree prune\`
+6. If a temporary stash was created in Step 3, keep it unless safe to apply cleanly. Report whether it remains.
 
 ## Rules
 - Always run default-branch merges in repoRoot (the default branch is checked out there).
@@ -19734,7 +19766,13 @@ var currentDir2, TASK_TEMPLATE_REPO_PATH = ".vibeman/templates/task.md", SOURCE_
 var init_templates = __esm(() => {
   currentDir2 = dirname4(fileURLToPath4(import.meta.url));
   SOURCE_RELATIVE_TEMPLATE_PATH = resolve7(currentDir2, "../../resources/templates/task.md");
-  RUNTIME_TEMPLATE_PATH_SEGMENTS = ["apps", "api", "resources", "templates", "task.md"];
+  RUNTIME_TEMPLATE_PATH_SEGMENTS = [
+    "apps",
+    "api",
+    "resources",
+    "templates",
+    "task.md"
+  ];
 });
 
 // ../../node_modules/@trpc/server/dist/codes-DagpWZLc.mjs
@@ -87077,7 +87115,12 @@ function buildTaskFileSection(input, mode) {
     ].join(`
 `);
   } catch {
-    return ["## Task File", `Path: ${taskPath}`, `Root: ${taskRoot}`, "(unable to read task file)"].join(`
+    return [
+      "## Task File",
+      `Path: ${taskPath}`,
+      `Root: ${taskRoot}`,
+      "(unable to read task file)"
+    ].join(`
 `);
   }
 }
@@ -89626,12 +89669,7 @@ function getWorkflowMeta2(runPayload) {
 }
 function resetWorkflowMetaCounters(runPayload) {
   const meta3 = getWorkflowMeta2(runPayload);
-  const {
-    humanInputs: _humanInputs,
-    pause: _pause,
-    workflowRefs: _workflowRefs,
-    ...rest
-  } = meta3;
+  const { humanInputs: _humanInputs, pause: _pause, workflowRefs: _workflowRefs, ...rest } = meta3;
   return {
     ...runPayload,
     [WORKFLOW_META_KEY]: {
@@ -89673,8 +89711,21 @@ async function updateTaskStatusForRunPayload(input) {
     const updatedContent = applyTaskStatusUpdate(originalContent, {
       status: input.status
     });
+    let fileUpdated = false;
     if (updatedContent !== originalContent) {
       await writeFile3(absoluteTaskPath, updatedContent, "utf8");
+      fileUpdated = true;
+    }
+    if (fileUpdated) {
+      await autoCommitTaskStatusUpdate({
+        runId: input.runId,
+        nodeKey: input.nodeKey,
+        repoRoot,
+        taskPath,
+        status: input.status,
+        taskId: typeof input.runPayload.taskId === "string" ? input.runPayload.taskId.trim() : undefined,
+        taskName: typeof input.runPayload.taskName === "string" ? input.runPayload.taskName.trim() : undefined
+      });
     }
   } catch (error48) {
     const message = error48 instanceof Error ? error48.message : String(error48);
@@ -89688,6 +89739,40 @@ async function updateTaskStatusForRunPayload(input) {
   }
   return input.runPayload;
 }
+function buildTaskStatusCommitMessage(input) {
+  const taskIdentity = input.taskId?.trim() || input.taskName?.trim() || input.taskPath;
+  return `task: ${taskIdentity} status ${input.status}`.replace(/\s+/g, " ").trim();
+}
+function isNothingToCommitError(message) {
+  const lowered = message.toLowerCase();
+  return lowered.includes("nothing to commit") || lowered.includes("no changes added to commit");
+}
+async function autoCommitTaskStatusUpdate(input) {
+  const commitMessage = buildTaskStatusCommitMessage({
+    taskId: input.taskId,
+    taskName: input.taskName,
+    taskPath: input.taskPath,
+    status: input.status
+  });
+  if (!commitMessage)
+    return;
+  try {
+    const git = createGitService(input.repoRoot);
+    await git.commit(commitMessage, { paths: [input.taskPath] });
+  } catch (error48) {
+    const message = error48 instanceof Error ? error48.message : String(error48);
+    if (isNothingToCommitError(message)) {
+      return;
+    }
+    logger.warn({
+      module: "workflow",
+      runId: input.runId,
+      nodeKey: input.nodeKey,
+      error: message,
+      taskPath: input.taskPath
+    }, "Failed to auto-commit task status update.");
+  }
+}
 function createLog2(event, data) {
   return { ts: new Date().toISOString(), level: "info", event, data };
 }
@@ -89728,6 +89813,7 @@ var init_runner2 = __esm(() => {
   init_codex_executor_config();
   init_types7();
   init_log();
+  init_git();
   init_task_markdown();
   init_tasks();
   import_client4 = __toESM(require_default2(), 1);

package/dist/commit.txt

@@ -1 +1 @@
-81c7406
+07b258d