@firstpick/pi-package-webui 0.4.5 → 0.4.7

package/bin/pi-webui.mjs

@@ -58,6 +58,7 @@ const webuiDevServer = isTruthyEnv(process.env.PI_WEBUI_DEV) || isSourceCheckout
 const DEFAULT_HOST = "127.0.0.1";
 const DEFAULT_PORT = 31415;
 const REQUEST_TIMEOUT_MS = 5 * 60 * 1000;
+const PROMPT_REQUEST_TIMEOUT_MS = Math.max(REQUEST_TIMEOUT_MS, Number.parseInt(process.env.PI_WEBUI_PROMPT_TIMEOUT_MS || "7200000", 10) || 7200000);
 const WEBUI_HELPER_TIMEOUT_MS = 8 * 1000;
 const WEBUI_HELPER_COMMAND = "webui-helper";
 const WEBUI_HELPER_RESPONSE_PREFIX = "__PI_WEBUI_HELPER_RESPONSE__:";
@@ -639,7 +640,8 @@ function makeHttpError(statusCode, message) {
 }
 
 function sendError(res, statusCode, error) {
-  sendJson(res, statusCode, { ok: false, error: sanitizeError(error) });
+  const message = statusCode >= 500 ? sanitizeError(error) : formatCliError(error);
+  sendJson(res, statusCode, { ok: false, error: message });
 }
 
 function formatBytes(bytes) {
@@ -1626,22 +1628,85 @@ function normalizeCustomRunnerDefinition(raw, projectRoot, { strict = false } =
   return { id, label, command, path: filePath, args };
 }
 
-async function readAppRunnerConfig(projectRoot) {
+function customAppRunnerDiagnostic(severity, message, runner = {}) {
+  const source = runner && typeof runner === "object" ? runner : {};
+  return {
+    severity,
+    message,
+    runnerId: source.id || "",
+    runnerLabel: source.label || "",
+    path: source.path || source.projectFile || "",
+  };
+}
+
+function directCustomRunnerUnavailableReason(filePath, stats) {
+  if (process.platform !== "win32" && stats && (stats.mode & 0o111) === 0) {
+    return `Path is not executable: ${filePath}. Run chmod +x ${filePath} or set Command to bash, python3, node, etc.`;
+  }
+  return "";
+}
+
+async function customAppRunnerUnavailableReason(projectRoot, runner) {
+  const filePath = runner.path;
+  let stats;
+  try {
+    stats = await fileStatsIfExists(resolveProjectRelativePath(projectRoot, filePath));
+  } catch (error) {
+    return `Cannot access path ${filePath}: ${formatCliError(error)}`;
+  }
+  if (!stats?.isFile()) return `Path to file does not exist: ${filePath}`;
+  const command = cleanCustomRunnerCommand(runner.command);
+  const directReason = command === "./" ? directCustomRunnerUnavailableReason(filePath, stats) : "";
+  if (directReason) return directReason;
+  const commandParts = customRunnerCommandParts(command);
+  if (command !== "./" && !await appRunnerCommandAvailable(commandParts[0], projectRoot)) return `Command is not available: ${commandParts[0]}`;
+  return "";
+}
+
+async function readAppRunnerConfig(projectRoot, { strictRead = false } = {}) {
   const configPath = path.join(projectRoot, APP_RUNNER_CONFIG_FILE);
-  const parsed = await readJsonFileIfExists(configPath);
-  const source = parsed && typeof parsed === "object" ? parsed : {};
+  let source = {};
+  const diagnostics = [];
+  try {
+    const parsed = JSON.parse(await readFile(configPath, "utf8"));
+    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+      source = parsed;
+    } else {
+      const message = `${APP_RUNNER_CONFIG_FILE} must contain a JSON object`;
+      if (strictRead) throw makeHttpError(400, message);
+      diagnostics.push(customAppRunnerDiagnostic("error", message));
+    }
+  } catch (error) {
+    if (error?.code !== "ENOENT") {
+      const message = `Cannot read ${APP_RUNNER_CONFIG_FILE}: ${formatCliError(error)}`;
+      if (strictRead) throw makeHttpError(400, message);
+      diagnostics.push(customAppRunnerDiagnostic("error", message));
+      console.warn(`failed to read custom app runner config ${configPath}: ${sanitizeError(error)}`);
+    }
+  }
+  if (source.runners !== undefined && !Array.isArray(source.runners)) {
+    const message = `${APP_RUNNER_CONFIG_FILE} runners must be an array`;
+    if (strictRead) throw makeHttpError(400, message);
+    diagnostics.push(customAppRunnerDiagnostic("error", message));
+  }
   const rawRunners = Array.isArray(source.runners) ? source.runners : [];
   const runners = [];
   for (const raw of rawRunners) {
     try {
       const runner = normalizeCustomRunnerDefinition(raw, projectRoot);
-      if (!runners.some((item) => item.id === runner.id)) runners.push(runner);
+      if (runners.some((item) => item.id === runner.id)) {
+        diagnostics.push(customAppRunnerDiagnostic("warning", `Duplicate custom runner ignored: ${runner.label || runner.path || runner.id}`, runner));
+      } else {
+        runners.push(runner);
+      }
     } catch (error) {
+      const message = `Invalid custom runner ignored: ${formatCliError(error)}`;
+      diagnostics.push(customAppRunnerDiagnostic("error", message, raw));
       console.warn(`skipping invalid custom app runner in ${configPath}: ${sanitizeError(error)}`);
     }
     if (runners.length >= APP_RUNNER_CUSTOM_LIMIT) break;
   }
-  return { projectRoot, configPath, runners };
+  return { projectRoot, configPath, runners, diagnostics };
 }
 
 async function writeAppRunnerConfig(projectRoot, runners) {
@@ -1659,15 +1724,12 @@ async function writeAppRunnerConfig(projectRoot, runners) {
 
 async function customAppRunnerCandidate(projectRoot, configPath, runner) {
   const filePath = runner.path;
-  const absolutePath = resolveProjectRelativePath(projectRoot, filePath);
-  const stats = await fileStatsIfExists(absolutePath);
-  if (!stats?.isFile()) return null;
+  if (await customAppRunnerUnavailableReason(projectRoot, runner)) return null;
   const command = cleanCustomRunnerCommand(runner.command);
   const args = parseCustomRunnerArgs(runner.args);
   const commandParts = customRunnerCommandParts(command);
   const effectiveCommand = command === "./" ? `./${filePath}` : commandParts[0];
   const effectiveArgs = command === "./" ? args : [...commandParts.slice(1), filePath, ...args];
-  if (command !== "./" && !await appRunnerCommandAvailable(commandParts[0], projectRoot)) return null;
   return appRunnerCandidate({
     id: appRunnerId("custom", runner.id),
     label: runner.label || path.basename(filePath),
@@ -1695,24 +1757,32 @@ async function addCustomAppRunners(runners, cwd) {
 async function getCustomAppRunnerConfigData(tab) {
   const projectRoot = await findAppRunnerProjectRoot(tab?.cwd || options.cwd);
   const config = await readAppRunnerConfig(projectRoot);
+  const runners = [];
+  for (const runner of config.runners) {
+    const unavailableReason = await customAppRunnerUnavailableReason(projectRoot, runner);
+    runners.push({
+      ...publicCustomRunnerDefinition(runner),
+      available: !unavailableReason,
+      unavailableReason,
+    });
+  }
   return {
     projectRoot,
     displayProjectRoot: displayPath(projectRoot),
     configFile: config.configPath,
     displayConfigFile: displayPath(config.configPath),
     relativeConfigFile: APP_RUNNER_CONFIG_FILE,
-    runners: config.runners.map(publicCustomRunnerDefinition),
+    runners,
+    diagnostics: config.diagnostics,
   };
 }
 
 async function saveCustomAppRunner(tab, rawRunner) {
   const projectRoot = await findAppRunnerProjectRoot(tab?.cwd || options.cwd);
-  const config = await readAppRunnerConfig(projectRoot);
+  const config = await readAppRunnerConfig(projectRoot, { strictRead: true });
   const normalized = normalizeCustomRunnerDefinition(rawRunner, projectRoot, { strict: true });
-  const stats = await fileStatsIfExists(resolveProjectRelativePath(projectRoot, normalized.path));
-  if (!stats?.isFile()) throw makeHttpError(400, `Path to file does not exist: ${normalized.path}`);
-  const commandParts = customRunnerCommandParts(normalized.command);
-  if (normalized.command !== "./" && !await appRunnerCommandAvailable(commandParts[0], projectRoot)) throw makeHttpError(400, `Command is not available: ${commandParts[0]}`);
+  const unavailableReason = await customAppRunnerUnavailableReason(projectRoot, normalized);
+  if (unavailableReason) throw makeHttpError(400, unavailableReason);
   const runners = config.runners.filter((runner) => runner.id !== normalized.id);
   if (runners.length >= APP_RUNNER_CUSTOM_LIMIT) throw makeHttpError(400, `Custom runner limit reached (${APP_RUNNER_CUSTOM_LIMIT})`);
   runners.push(normalized);
@@ -3065,6 +3135,7 @@ async function getWorkspaceInfo(cwd, startedAt) {
 let activeGitWorkflowProcess = null;
 const GIT_CHANGES_COMMAND_TIMEOUT_MS = 5000;
 const GIT_CHANGES_DIFF_MAX_OUTPUT = 500_000;
+const GIT_PULL_TIMEOUT_MS = 15 * 60 * 1000;
 
 async function getGitRoot(cwd) {
   const result = await runCommand("git", ["rev-parse", "--show-toplevel"], { cwd, timeoutMs: 2000 });
@@ -3175,15 +3246,61 @@ async function readGitUntrackedFile(cwd, requestedPath) {
   return readGitUntrackedEntry(root, normalized);
 }
 
+async function gitUpstreamRef(root) {
+  try {
+    const upstream = await runGitReadCommand(root, ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{upstream}"], { timeoutMs: 5000, maxOutputLength: 10_000 });
+    return upstream.trim();
+  } catch {
+    return "";
+  }
+}
+
+async function readGitIncomingChanges(root, summary) {
+  const upstream = await gitUpstreamRef(root);
+  const remote = {
+    upstream,
+    behind: Number(summary?.behind || 0) || 0,
+    canPull: !!upstream && (Number(summary?.behind || 0) || 0) > 0,
+  };
+  if (!remote.canPull) return { remote, section: null };
+
+  const diffArgs = ["diff", "--no-ext-diff", "--no-color", "--find-renames", "--unified=0", "--src-prefix=a/", "--dst-prefix=b/", "HEAD..@{upstream}"];
+  try {
+    const diff = await runGitReadCommand(root, diffArgs);
+    return {
+      remote,
+      section: {
+        key: "incoming",
+        label: `Incoming from ${upstream}`,
+        command: `git diff --unified=0 HEAD..${upstream}`,
+        diff: diff.trimEnd(),
+      },
+    };
+  } catch (error) {
+    return { remote: { ...remote, error: sanitizeError(error) }, section: null };
+  }
+}
+
+async function pullGitChanges(cwd) {
+  const root = await getGitRoot(cwd);
+  const payload = gitWorkflowCommandPayload(await runGitWorkflowCommand(["pull", "--ff-only"], { cwd: root, timeoutMs: GIT_PULL_TIMEOUT_MS }));
+  if (payload.data) payload.data.root = root;
+  if (payload.ok) payload.data.changes = await readGitChanges(root);
+  else payload.error = (payload.data?.stderr || payload.data?.stdout || payload.error || "git pull --ff-only failed").trim();
+  return payload;
+}
+
 async function readGitChanges(cwd) {
   const root = await getGitRoot(cwd);
-  const diffArgs = ["diff", "--no-ext-diff", "--no-color", "--find-renames", "--src-prefix=a/", "--dst-prefix=b/"];
+  const diffArgs = ["diff", "--no-ext-diff", "--no-color", "--find-renames", "--unified=0", "--src-prefix=a/", "--dst-prefix=b/"];
   const [statusText, unstagedDiff, stagedDiff, untrackedText] = await Promise.all([
     runGitReadCommand(root, ["status", "--short", "--branch", "--untracked-files=all"], { maxOutputLength: 120_000 }),
     runGitReadCommand(root, diffArgs),
-    runGitReadCommand(root, ["diff", "--cached", "--no-ext-diff", "--no-color", "--find-renames", "--src-prefix=a/", "--dst-prefix=b/"]),
+    runGitReadCommand(root, ["diff", "--cached", "--no-ext-diff", "--no-color", "--find-renames", "--unified=0", "--src-prefix=a/", "--dst-prefix=b/"]),
     runGitReadCommand(root, ["ls-files", "--others", "--exclude-standard"], { maxOutputLength: 120_000 }),
   ]);
+  const summary = summarizeGitShortStatus(statusText);
+  const incoming = await readGitIncomingChanges(root, summary);
   const untrackedFiles = untrackedText.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
   const untracked = await readGitUntrackedEntries(root, untrackedFiles);
   return {
@@ -3191,12 +3308,14 @@ async function readGitChanges(cwd) {
     root,
     branch: gitBranchFromStatus(statusText),
     generatedAt: new Date().toISOString(),
-    summary: summarizeGitShortStatus(statusText),
+    summary,
+    remote: incoming.remote,
     status: statusText.trimEnd(),
     sections: [
-      { key: "staged", label: "Staged", command: "git diff --cached", diff: stagedDiff.trimEnd() },
-      { key: "unstaged", label: "Unstaged", command: "git diff", diff: unstagedDiff.trimEnd() },
-    ],
+      incoming.section,
+      { key: "staged", label: "Staged", command: "git diff --cached --unified=0", diff: stagedDiff.trimEnd() },
+      { key: "unstaged", label: "Unstaged", command: "git diff --unified=0", diff: unstagedDiff.trimEnd() },
+    ].filter(Boolean),
     untracked,
   };
 }
@@ -7545,7 +7664,7 @@ const server = createServer(async (req, res) => {
         maybeNameTabForConversation(tab, command);
         markTabWorking(tab);
       }
-      const response = await tab.rpc.send(command);
+      const response = await tab.rpc.send(command, PROMPT_REQUEST_TIMEOUT_MS);
       if (response.success === false && startsVisibleWork) markTabIdle(tab);
       sendJson(res, response.success === false ? 400 : 200, responseWithTab(response, tab));
       return;
@@ -7571,6 +7690,17 @@ const server = createServer(async (req, res) => {
       return;
     }
 
+    if (url.pathname === "/api/git-changes/pull" && req.method === "POST") {
+      const body = await readJsonBody(req);
+      const tab = getRequestedTab(req, url, body);
+      try {
+        sendJson(res, 200, await pullGitChanges(tab.cwd));
+      } catch (error) {
+        sendJson(res, 200, { ok: false, error: sanitizeError(error) });
+      }
+      return;
+    }
+
     if (url.pathname === "/api/git-branches" && req.method === "GET") {
       const tab = getRequestedTab(req, url);
       try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firstpick/pi-package-webui",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "Pi Web UI companion package with a local browser UI CLI plus /webui-start and /webui-status commands.",
   "license": "MIT",
   "homepage": "https://github.com/Firstp1ck/npm-packages/tree/main/pi-package-webui#readme",
@@ -53,7 +53,7 @@
     "test": "node tests/run-all.mjs"
   },
   "dependencies": {
-    "@earendil-works/pi-coding-agent": "^0.79.3"
+    "@earendil-works/pi-coding-agent": "^0.79.7"
   },
   "optionalDependencies": {
     "@firstpick/pi-extension-btw": "^0.1.0",
@@ -66,7 +66,7 @@
     "@firstpick/pi-extension-todo-progress": "^0.2.4",
     "@firstpick/pi-extension-tools": "^0.1.6",
     "@firstpick/pi-extension-workflows": "^0.1.0",
-    "@firstpick/pi-package-remote-webui": "^0.1.0",
+    "@firstpick/pi-package-remote-webui": "^0.1.2",
     "@firstpick/pi-prompts-git-pr": "^0.1.2",
     "@firstpick/pi-themes-bundle": "^0.1.4"
   },
@@ -84,5 +84,12 @@
   ],
   "engines": {
     "node": ">=22.19.0"
+  },
+  "overrides": {
+    "@earendil-works/pi-coding-agent": {
+      "protobufjs": "7.6.3",
+      "undici": "8.5.0",
+      "ws": "8.21.0"
+    }
   }
 }