vibe-coding-master 0.7.49 → 0.7.50

package/README.md

@@ -124,8 +124,9 @@ If you want VCM app state to survive container rebuilds, set:
 1. Start VCM with `vcm`.
 2. Open the GUI.
 3. In `Repository`, enter a local Git repository path and click `Connect`.
-4. Create or select a task in the `Task` section. VCM creates a task branch and
-   worktree immediately.
+4. Create or select a task in the `Task` section. Before creating a new task,
+   VCM fast-forward pulls the connected branch when it has an upstream, then
+   creates the task branch and worktree from the updated `HEAD`.
 5. In `VCM Harness`, initialize or update fixed harness files if VCM reports
    pending changes. Harness changes are written to the active task worktree.
 6. If bootstrap is incomplete, open Harness Studio and run bootstrap through
@@ -632,6 +633,7 @@ Make sure:
 
 - the repository is a Git repository
 - the connected base repo is clean
+- the connected branch can be fast-forward pulled when it has an upstream
 - no other task is currently active for this project
 - the derived `feature/<task>` branch does not already exist
 - the derived `.claude/worktrees/<task>` directory does not already exist

package/dist/backend/services/runtime-recovery-service.js

@@ -34,7 +34,7 @@ export function createRuntimeRecoveryService(deps) {
                     const roundRecovered = await recoverRound(taskRepoRoot, config.stateRoot, task.taskSlug, recoveredAt, context);
                     await recoverMessages(taskRepoRoot, config.stateRoot, task.taskSlug, recoveredAt, context);
                     await recoverGateReview(taskRepoRoot, recoveredAt, context);
-                    await cleanupCoderWorkers(taskRepoRoot, context);
+                    await recoverCoderWorkers(taskRepoRoot, task.taskSlug, context);
                     await deps.architectRestartService?.recoverTask(repoRoot, task.taskSlug);
                     await deps.roleContextRestartService?.recoverTask(repoRoot, task.taskSlug);
                     if ((roundRecovered || task.status === "running") && !hasLiveTaskSession(task.taskSlug)) {
@@ -238,16 +238,32 @@ export function createRuntimeRecoveryService(deps) {
         });
         context.changedPaths.add(relativePath);
     }
-    async function cleanupCoderWorkers(taskRepoRoot, context) {
-        const absolutePath = path.join(taskRepoRoot, CODER_WORKERS_RUNTIME_DIR);
-        if (!(await deps.fs.pathExists(absolutePath))) {
+    async function recoverCoderWorkers(taskRepoRoot, taskSlug, context) {
+        if (hasLiveRoundRole(taskSlug, "coder") || !deps.fs.removePath) {
             return;
         }
-        if (!deps.fs.removePath) {
+        const tasksPath = path.join(taskRepoRoot, CODER_WORKERS_RUNTIME_DIR, "tasks");
+        if (!(await deps.fs.pathExists(tasksPath))) {
             return;
         }
-        await deps.fs.removePath(absolutePath, { recursive: true, force: true });
-        context.changedPaths.add(CODER_WORKERS_RUNTIME_DIR);
+        for (const entry of await deps.fs.readDir(tasksPath)) {
+            if (!entry.endsWith(".json")) {
+                continue;
+            }
+            const absolutePath = path.join(tasksPath, entry);
+            let state;
+            try {
+                state = await deps.fs.readJson(absolutePath);
+            }
+            catch {
+                continue;
+            }
+            if (state.status !== "running" || state.handled === true) {
+                continue;
+            }
+            await deps.fs.removePath(absolutePath, { force: true });
+            context.changedPaths.add(path.posix.join(CODER_WORKERS_RUNTIME_DIR, "tasks", entry));
+        }
     }
     async function recoverHarnessBootstrap(repoRoot, _timestamp, context) {
         const absolutePath = path.join(repoRoot, BOOTSTRAP_SESSION_PATH);

package/dist/backend/services/task-service.js

@@ -53,6 +53,19 @@ export function createTaskService(deps) {
                     hint: `Commit, stash, or discard these changes before creating a task worktree: ${baseVisibleChanges.slice(0, 12).join(", ")}`
                 });
             }
+            const upstreamBranch = await deps.git.getUpstreamBranch(repoRoot);
+            if (upstreamBranch) {
+                await deps.git.pullFastForward(repoRoot);
+                const postPullVisibleChanges = await getBaseRepoVisibleChanges(deps.git, repoRoot);
+                if (postPullVisibleChanges.length > 0) {
+                    throw new VcmError({
+                        code: "BASE_REPO_DIRTY",
+                        message: "The connected repository has Git-visible changes after pulling its upstream branch.",
+                        statusCode: 409,
+                        hint: `Commit, stash, or discard these changes before creating a task worktree: ${postPullVisibleChanges.slice(0, 12).join(", ")}`
+                    });
+                }
+            }
             const timestamp = now();
             await deps.fs.ensureDir(path.dirname(worktreePath));
             await deps.git.createWorktree({

package/dist/backend/templates/harness/architect-agent.js

@@ -51,7 +51,6 @@ ${renderRoleMemoryRules("architect")}
 - Use \`vcm-architect-validation-worker\` for exact non-interactive commands already selected by Architect. The worker does not select validation scope, modify tests or code, diagnose failures, or decide whether validation is sufficient.
 - Do not rerun a green command already reported by another Architect worker merely to execute it in the main Architect context.
 - Validation workers write reports under \`.ai/vcm/architect-workers/validation/\`. Architect must interpret the raw results and copy required evidence into the owning Architect artifact.
-- Remove \`.ai/vcm/architect-workers/\` after its accepted facts and command results have been consolidated into Architect-owned artifacts.
 
 ### Architecture Interview
 

package/dist/backend/templates/harness/coder-agent.js

@@ -74,7 +74,7 @@ ${renderRoleMemoryRules("coder")}
 - Stay in the same Coder turn until every worker state is \`completed\` and Coder has reviewed and integrated all reports and commits. Do not end the turn to wait for worker callbacks.
 - A completed worker reports \`Implementation Result: success|has_failed_items\`; \`completed\` means the full assigned sweep and handoff finished, not that every item passed.
 - After workers finish, inspect each item disposition and commit, integrate successful work and committed failure scenes, resolve integration conflicts or invalid edits, and verify that every remaining marker corresponds to a failed disposition. Only then mark \`handled: true\` in each worker state.
-- Run coder-level baseline validation, summarize worker reports and commits in \`.ai/vcm/handoffs/coder-completion.md\`, and clean \`.ai/vcm/coder-workers/\`.
+- Run coder-level baseline validation and summarize worker reports and commits in \`.ai/vcm/handoffs/coder-completion.md\`.
 
 ### Handoff
 

package/dist/backend/templates/harness/vcm-long-running-validation-skill.js

@@ -18,7 +18,7 @@ The hard ceiling is 60 minutes per job, enforced by the job worker itself. No ap
 3. If watch-job exits 125, the job is still running and a bounded handoff is active for the next watcher: run \`.ai/tools/watch-job <job-id>\` again immediately. Do not end the turn between windows.
 4. Repeat until watch-job reports a terminal result.
 5. Read the final status and the relevant log tail.
-6. Record command, result, duration, and required follow-up wherever the caller normally records command evidence.
+6. Record job ID, command, result, duration, and required follow-up wherever the caller normally records command evidence.
 
 Example:
 
@@ -71,8 +71,5 @@ On timeout the worker stops the command process group and records \`timeout\` in
 - do not mark the command as passed
 - do not retry in the background
 
-## Cleanup
-
-\`.ai/vcm/jobs/**\` is runtime state. Delete it after the command result and useful log evidence have been recorded where needed.
 `;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibe-coding-master",
-  "version": "0.7.49",
+  "version": "0.7.50",
   "description": "Local GUI session cockpit for Claude Code role sessions.",
   "type": "module",
   "files": [