@rubytech/taskmaster 1.0.24 → 1.0.26

package/dist/build-info.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.24",
-  "commit": "fd55994cbc10e1c390f68acd56135c273c7a34ce",
-  "builtAt": "2026-02-16T08:38:04.270Z"
+  "version": "1.0.26",
+  "commit": "33e5a12e40842693dc295ef74fb697578f84b8e1",
+  "builtAt": "2026-02-16T08:43:03.022Z"
 }

package/dist/gateway/server-methods/update.js

@@ -138,7 +138,8 @@ export const updateHandlers = {
             },
             onStepComplete: (step) => {
                 const ok = step.exitCode === 0 || step.exitCode === null;
-                log.info(`update step ${step.index + 1}/${step.total}: ${step.name} ${ok ? "ok" : `FAILED (exit ${step.exitCode})`} (${step.durationMs}ms)`);
+                const logFn = ok ? log.info.bind(log) : log.error.bind(log);
+                logFn(`update step ${step.index + 1}/${step.total}: ${step.name} ${ok ? "ok" : `FAILED (exit ${step.exitCode})`} (${step.durationMs}ms)`);
                 context.broadcast("update.progress", {
                     phase: "step-done",
                     name: step.name,
@@ -176,7 +177,7 @@ export const updateHandlers = {
             log.info(`software update completed (${result.mode}, ${result.durationMs}ms)`);
         }
         else {
-            log.warn(`software update ${result.status}: ${result.reason ?? "unknown"} (${result.mode}, ${result.durationMs}ms)`);
+            log.error(`software update ${result.status}: ${result.reason ?? "unknown"} (${result.mode}, ${result.durationMs}ms)`);
         }
         const payload = {
             kind: "update",

package/dist/infra/update-runner.js

@@ -8,7 +8,6 @@ import { detectGlobalInstallManagerForRoot, globalInstallArgs } from "./update-g
 import { trimLogTail } from "./restart-sentinel.js";
 const DEFAULT_TIMEOUT_MS = 20 * 60_000;
 const MAX_LOG_CHARS = 8000;
-const PREFLIGHT_MAX_COMMITS = 10;
 const START_DIRS = ["cwd", "argv1", "process"];
 /**
  * Build an augmented PATH that includes common binary locations.
@@ -278,7 +277,9 @@ export async function runGatewayUpdate(opts = {}) {
         const channel = opts.channel ?? "dev";
         const branch = channel === "dev" ? await readBranchName(runCommand, gitRoot, timeoutMs) : null;
         const needsCheckoutMain = channel === "dev" && branch !== DEV_BRANCH;
-        gitTotalSteps = channel === "dev" ? (needsCheckoutMain ? 11 : 10) : 9;
+        // Steps: clean check + [checkout main] + upstream check + fetch + rebase/checkout
+        //        + install + build + ui:build + restore control-ui + doctor + rev-parse
+        gitTotalSteps = channel === "dev" ? (needsCheckoutMain ? 10 : 9) : 9;
         const statusCheck = await runStep(step("clean check", ["git", "-C", gitRoot, "status", "--porcelain", "-uno", "--", ":!dist/control-ui/"], gitRoot));
         steps.push(statusCheck);
         const hasUncommittedChanges = statusCheck.stdoutTail && statusCheck.stdoutTail.trim().length > 0;
@@ -332,110 +333,7 @@ export async function runGatewayUpdate(opts = {}) {
             }
             const fetchStep = await runStep(step("git fetch", ["git", "-C", gitRoot, "fetch", "--all", "--prune", "--tags"], gitRoot));
             steps.push(fetchStep);
-            const upstreamShaStep = await runStep(step("git rev-parse @{upstream}", ["git", "-C", gitRoot, "rev-parse", "@{upstream}"], gitRoot));
-            steps.push(upstreamShaStep);
-            const upstreamSha = upstreamShaStep.stdoutTail?.trim();
-            if (!upstreamShaStep.stdoutTail || !upstreamSha) {
-                return {
-                    status: "error",
-                    mode: "git",
-                    root: gitRoot,
-                    reason: "no-upstream-sha",
-                    before: { sha: beforeSha, version: beforeVersion },
-                    steps,
-                    durationMs: Date.now() - startedAt,
-                };
-            }
-            const revListStep = await runStep(step("git rev-list", ["git", "-C", gitRoot, "rev-list", `--max-count=${PREFLIGHT_MAX_COMMITS}`, upstreamSha], gitRoot));
-            steps.push(revListStep);
-            if (revListStep.exitCode !== 0) {
-                return {
-                    status: "error",
-                    mode: "git",
-                    root: gitRoot,
-                    reason: "preflight-revlist-failed",
-                    before: { sha: beforeSha, version: beforeVersion },
-                    steps,
-                    durationMs: Date.now() - startedAt,
-                };
-            }
-            const candidates = (revListStep.stdoutTail ?? "")
-                .split("\n")
-                .map((line) => line.trim())
-                .filter(Boolean);
-            if (candidates.length === 0) {
-                return {
-                    status: "error",
-                    mode: "git",
-                    root: gitRoot,
-                    reason: "preflight-no-candidates",
-                    before: { sha: beforeSha, version: beforeVersion },
-                    steps,
-                    durationMs: Date.now() - startedAt,
-                };
-            }
-            const manager = await detectPackageManager(gitRoot);
-            const preflightRoot = await fs.mkdtemp(path.join(os.tmpdir(), "taskmaster-update-preflight-"));
-            const worktreeDir = path.join(preflightRoot, "worktree");
-            const worktreeStep = await runStep(step("preflight worktree", ["git", "-C", gitRoot, "worktree", "add", "--detach", worktreeDir, upstreamSha], gitRoot));
-            steps.push(worktreeStep);
-            if (worktreeStep.exitCode !== 0) {
-                await fs.rm(preflightRoot, { recursive: true, force: true }).catch(() => { });
-                return {
-                    status: "error",
-                    mode: "git",
-                    root: gitRoot,
-                    reason: "preflight-worktree-failed",
-                    before: { sha: beforeSha, version: beforeVersion },
-                    steps,
-                    durationMs: Date.now() - startedAt,
-                };
-            }
-            let selectedSha = null;
-            try {
-                for (const sha of candidates) {
-                    const shortSha = sha.slice(0, 8);
-                    const checkoutStep = await runStep(step(`preflight checkout (${shortSha})`, ["git", "-C", worktreeDir, "checkout", "--detach", sha], worktreeDir));
-                    steps.push(checkoutStep);
-                    if (checkoutStep.exitCode !== 0)
-                        continue;
-                    const depsStep = await runStep(step(`preflight deps install (${shortSha})`, managerInstallArgs(manager), worktreeDir));
-                    steps.push(depsStep);
-                    if (depsStep.exitCode !== 0)
-                        continue;
-                    const lintStep = await runStep(step(`preflight lint (${shortSha})`, managerScriptArgs(manager, "lint"), worktreeDir));
-                    steps.push(lintStep);
-                    if (lintStep.exitCode !== 0)
-                        continue;
-                    const buildStep = await runStep(step(`preflight build (${shortSha})`, managerScriptArgs(manager, "build"), worktreeDir));
-                    steps.push(buildStep);
-                    if (buildStep.exitCode !== 0)
-                        continue;
-                    selectedSha = sha;
-                    break;
-                }
-            }
-            finally {
-                const removeStep = await runStep(step("preflight cleanup", ["git", "-C", gitRoot, "worktree", "remove", "--force", worktreeDir], gitRoot));
-                steps.push(removeStep);
-                await runCommand(["git", "-C", gitRoot, "worktree", "prune"], {
-                    cwd: gitRoot,
-                    timeoutMs,
-                }).catch(() => null);
-                await fs.rm(preflightRoot, { recursive: true, force: true }).catch(() => { });
-            }
-            if (!selectedSha) {
-                return {
-                    status: "error",
-                    mode: "git",
-                    root: gitRoot,
-                    reason: "preflight-no-good-commit",
-                    before: { sha: beforeSha, version: beforeVersion },
-                    steps,
-                    durationMs: Date.now() - startedAt,
-                };
-            }
-            const rebaseStep = await runStep(step("git rebase", ["git", "-C", gitRoot, "rebase", selectedSha], gitRoot));
+            const rebaseStep = await runStep(step("git rebase", ["git", "-C", gitRoot, "rebase", "@{upstream}"], gitRoot));
             steps.push(rebaseStep);
             if (rebaseStep.exitCode !== 0) {
                 const abortResult = await runCommand(["git", "-C", gitRoot, "rebase", "--abort"], {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rubytech/taskmaster",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "AI-powered business assistant for small businesses",
   "publishConfig": {
     "access": "public"