@stevecastaneda/paseo-progress 1.13.1 → 1.14.1

package/dist/server/cli.js

@@ -19706,7 +19706,6 @@ var QUESTION_MODE_RULES = {
 // shared/events.ts
 var PROGRESS_FILE_NAME = "progress.jsonl";
 var PANEL_OPENED_NAME = "progress-panel-opened";
-var LEGACY_FOLDER = ".scratch";
 var EVENT_VERSION = 1;
 var TICKET_STATUSES = ["not_started", "working", "blocked", "done", "skipped"];
 var ticketStatusSchema = external_exports.enum(TICKET_STATUSES);
@@ -20270,10 +20269,16 @@ import { dirname, isAbsolute, join as join2, resolve, sep } from "node:path";
 function outside(inside) {
   return inside === ".." || inside.startsWith(`..${sep}`) || isAbsolute(inside);
 }
+function inGitFolder(inside) {
+  return inside.split(/[\\/]/).some((name) => name.toLowerCase() === ".git");
+}
+function hasGitEntry(directory) {
+  return existsSync(join2(directory, ".git"));
+}
 function findRoot(cwd) {
   let directory = resolve(cwd);
   while (true) {
-    if (existsSync(join2(directory, ".git"))) return directory;
+    if (hasGitEntry(directory)) return directory;
     const parent = dirname(directory);
     if (parent === directory) return resolve(cwd);
     directory = parent;
@@ -20385,33 +20390,33 @@ async function installLauncher(path, platform = process.platform) {
 import { execFile } from "node:child_process";
 import { createHash, randomUUID } from "node:crypto";
 import { realpathSync } from "node:fs";
-import { appendFile as appendFile2, mkdir as mkdir4, readdir, readFile as readFile3, rename, rm as rm2, rmdir, stat as stat3, writeFile as writeFile3 } from "node:fs/promises";
+import { lstat, mkdir as mkdir4, readdir, realpath, rename, rm as rm2, stat as stat3, writeFile as writeFile3 } from "node:fs/promises";
 import { homedir } from "node:os";
-import { basename as basename2, dirname as dirname3, join as join4, normalize, resolve as resolve2 } from "node:path";
+import { basename as basename2, dirname as dirname3, join as join4, normalize, resolve as resolve2, sep as sep2 } from "node:path";
 import { promisify } from "node:util";
-var LOCK_NAME2 = `${PROGRESS_FILE_NAME}.lock`;
 var SAVE_RUNS_KEY = "paseo-progress.saveRuns";
-var LEGACY_GITIGNORE = `# Added by the progress plugin for Paseo so its files stay out of git.
-${PROGRESS_FILE_NAME}
-${LOCK_NAME2}/
-${PANEL_OPENED_NAME}
-.gitignore
-`;
-async function git(cwd, args) {
+async function git(root, args) {
   try {
-    const { stdout } = await promisify(execFile)("git", args, { cwd });
+    const { stdout } = await promisify(execFile)("git", ["-C", resolve2(root), ...args], { cwd: dirname3(process.execPath) });
     return { code: 0, stdout };
   } catch (error62) {
     const failed = error62;
     return { code: typeof failed.code === "number" ? failed.code : -1, stdout: failed.stdout ?? "" };
   }
 }
-async function exists2(path) {
-  return Boolean(await stat3(path).catch(() => null));
-}
 function stateRoot(home = homedir()) {
   return join4(home, ".local", "state", "paseo-progress");
 }
+async function writeAtomic(path, text2) {
+  await mkdir4(dirname3(path), { recursive: true });
+  const temp = `${path}.${randomUUID()}.tmp`;
+  try {
+    await writeFile3(temp, text2);
+    await rename(temp, path);
+  } finally {
+    await rm2(temp, { force: true });
+  }
+}
 function outsideDirectory(root, home = homedir()) {
   let real = root;
   try {
@@ -20421,51 +20426,18 @@ function outsideDirectory(root, home = homedir()) {
   const hash2 = createHash("sha1").update(real).digest("hex").slice(0, 8);
   return join4(stateRoot(home), `${basename2(real)}-${hash2}`);
 }
-var trackedLegacy = /* @__PURE__ */ new Map();
-async function legacyTracked(root, mtimeMs) {
-  const cached2 = trackedLegacy.get(root);
-  if (cached2 && cached2.mtimeMs === mtimeMs) return cached2.tracked;
-  const { code } = await git(root, ["ls-files", "--error-unmatch", "--", `${LEGACY_FOLDER}/${PROGRESS_FILE_NAME}`]);
-  trackedLegacy.set(root, { mtimeMs, tracked: code === 0 });
-  return code === 0;
-}
-async function findStore(root, home = homedir()) {
+function findStore(root, home = homedir()) {
   const directory = outsideDirectory(root, home);
-  const store = { directory, shown: directory.startsWith(home) ? `~${directory.slice(home.length)}` : directory };
-  const legacy = join4(root, LEGACY_FOLDER);
-  const info = await stat3(join4(legacy, PROGRESS_FILE_NAME)).catch(() => null);
-  if (!info) return store;
-  if (await legacyTracked(root, info.mtimeMs)) return { directory: legacy, shown: LEGACY_FOLDER };
-  await moveLegacy(legacy, directory);
-  return store;
-}
-async function moveLegacy(legacy, directory) {
-  await mkdir4(directory, { recursive: true });
-  await withLock(join4(legacy, LOCK_NAME2), async () => {
-    const text2 = await readFile3(join4(legacy, PROGRESS_FILE_NAME), "utf8").catch(() => null);
-    if (text2 === null) return;
-    await withLock(join4(directory, LOCK_NAME2), async () => {
-      const current = await readFile3(join4(directory, PROGRESS_FILE_NAME), "utf8").catch(() => "");
-      const lead = current && !current.endsWith("\n") ? "\n" : "";
-      await appendFile2(join4(directory, PROGRESS_FILE_NAME), `${lead}${text2}`);
-    });
-    await rm2(join4(legacy, PROGRESS_FILE_NAME));
-    if (await exists2(join4(legacy, PANEL_OPENED_NAME))) {
-      await writeFile3(join4(directory, PANEL_OPENED_NAME), "");
-      await rm2(join4(legacy, PANEL_OPENED_NAME));
-    }
-  });
-  const ignore = await readFile3(join4(legacy, ".gitignore"), "utf8").catch(() => null);
-  if (ignore === LEGACY_GITIGNORE) await rm2(join4(legacy, ".gitignore"));
-  await rmdir(legacy).catch(() => {
-  });
+  return { directory, shown: directory.startsWith(home) ? `~${directory.slice(home.length)}` : directory };
 }
 var configFiles = /* @__PURE__ */ new Map();
 var savedFolders = /* @__PURE__ */ new Map();
 async function configFile(root) {
+  if (!hasGitEntry(root)) return null;
   if (!configFiles.has(root)) {
     const { code, stdout } = await git(root, ["rev-parse", "--git-common-dir"]);
-    configFiles.set(root, code === 0 ? join4(resolve2(root, stdout.trim()), "config") : null);
+    if (code !== 0) return null;
+    configFiles.set(root, join4(resolve2(root, stdout.trim()), "config"));
   }
   return configFiles.get(root);
 }
@@ -20476,10 +20448,19 @@ async function historyFolder(root) {
   const cached2 = savedFolders.get(file2);
   if (cached2 && cached2.mtimeMs === mtimeMs) return cached2.folder;
   const { stdout } = await git(root, ["config", "--get", SAVE_RUNS_KEY]);
-  const folder = stdout.trim() || null;
+  const checked = checkFolder(stdout);
+  const folder = "folder" in checked ? checked.folder : null;
   savedFolders.set(file2, { mtimeMs, folder });
   return folder;
 }
+function checkFolder(raw) {
+  const trimmed = raw.trim().replace(/\/+$/, "");
+  if (!trimmed) return { error: "Choose a folder" };
+  const folder = normalize(trimmed);
+  if (outside(folder) || folder === ".") return { error: "Choose a folder inside the repo" };
+  if (inGitFolder(folder)) return { error: "Choose a folder outside .git" };
+  return { folder };
+}
 function runFileName(startedAt, title) {
   const stamp = startedAt.replace(/\.\d+Z$/, "").replace(/[-:]/g, "").replace("T", "-");
   const slug = title.toLowerCase().normalize("NFKD").replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 60);
@@ -20488,29 +20469,27 @@ function runFileName(startedAt, title) {
 async function saveRunCopy(root, text2) {
   const folder = await historyFolder(root);
   if (!folder) return;
-  const lines = text2.split("\n").filter((line) => line.trim());
-  let start = -1;
-  let event = null;
-  for (let index = lines.length - 1; index >= 0; index--) {
-    try {
-      const parsed = JSON.parse(lines[index]);
-      if (parsed?.type === "run.start") {
-        start = index;
-        event = parsed;
-        break;
-      }
-    } catch {
-    }
-  }
-  if (start < 0 || !event?.ts || !event.title) return;
-  const directory = join4(root, folder);
-  await mkdir4(directory, { recursive: true });
-  await writeFile3(join4(directory, runFileName(event.ts, event.title)), `${lines.slice(start).join("\n")}
+  const [start] = latestRun(parseProgress(text2).events);
+  if (start?.event.type !== "run.start") return;
+  const lines = text2.split("\n").slice(start.line - 1).filter((line) => line.trim());
+  const directory = await runsFolder(root, folder);
+  if (!directory) return;
+  await writeAtomic(join4(directory, runFileName(start.event.ts, start.event.title)), `${lines.join("\n")}
 `);
 }
+async function runsFolder(root, folder) {
+  let directory = await realpath(root);
+  for (const name of folder.split(sep2)) {
+    directory = join4(directory, name);
+    const info = await lstat(directory).catch(() => null);
+    if (!info) await mkdir4(directory);
+    else if (!info.isDirectory()) return null;
+  }
+  return directory;
+}
 
 // server/question-mode.ts
-import { readFile as readFile4, rm as rm3 } from "node:fs/promises";
+import { readFile as readFile3, rm as rm3 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
 import { join as join5 } from "node:path";
 var mirrorSchema = external_exports.object({ questionMode: external_exports.enum(QUESTION_MODES) });
@@ -20519,7 +20498,7 @@ function questionModePath(home = homedir2()) {
 }
 async function readQuestionMode(home = homedir2()) {
   try {
-    return mirrorSchema.parse(JSON.parse(await readFile4(questionModePath(home), "utf8"))).questionMode;
+    return mirrorSchema.parse(JSON.parse(await readFile3(questionModePath(home), "utf8"))).questionMode;
   } catch {
     return DEFAULT_QUESTION_MODE;
   }
@@ -21055,6 +21034,12 @@ function guessKind(target, isUrl, cwd) {
 var SHOW_SUMMARY = "Print the dashboard as text: what the user sees in the Progress panel.";
 var INSTALL_SUMMARY = "Write the paseo-progress launcher (default ~/.local/bin/paseo-progress). It runs this command from whichever copy of the plugin Paseo is running.";
 var DEFAULT_LAUNCHER = "~/.local/bin/paseo-progress";
+function commandSummary(name) {
+  if (name === "show") return SHOW_SUMMARY;
+  const command = commands[name];
+  if (!command) throw new Error(`No command named ${name}.`);
+  return command.summary;
+}
 function help() {
   return [
     `Usage: ${USAGE_NAME} <command>`,
@@ -21166,5 +21151,6 @@ if (isMain()) {
   );
 }
 export {
+  commandSummary,
   runCli
 };

package/index.client.tsx

@@ -7,6 +7,8 @@ import { ProgressLanguageProvider } from "./client/language";
 import { addPageScreen } from "./client/page-screen";
 import { PdfPanel } from "./client/pdf";
 import { showsPdfs } from "./shared/attachments";
+import { CHAT_ROW_KIND, CHAT_ROW_VERSION, chatRowSchema, transformChatRow } from "./client/chat-row";
+import { ChatRowView } from "./client/chat-row-view";
 
 const SETTINGS_ID = "settings";
 
@@ -45,8 +47,17 @@ export default function contribute(client: PluginClientContext) {
     icon: "Settings",
     Component: (props) => <ProgressLanguageProvider><QuestionSettings {...props} /></ProgressLanguageProvider>,
   });
+  const stopTransformer = client.addTimelineTransformer({ id: "tool-calls", query: { itemType: "tool_call" }, transform: transformChatRow });
+  const stopRenderer = client.addTimelineRenderer({
+    kind: CHAT_ROW_KIND,
+    version: CHAT_ROW_VERSION,
+    schema: chatRowSchema,
+    Component: (props) => <ProgressLanguageProvider><ChatRowView {...props} /></ProgressLanguageProvider>,
+  });
 
   return () => {
+    void stopTransformer();
+    void stopRenderer();
     stopPage();
     void stopPdf();
     void stopSettings();

package/index.server.ts

@@ -4,8 +4,9 @@ import { handleInstallLauncher, handleLauncherStatus } from "./server/launcher";
 import { handleCanOpenOnHost, handleOpenDeliverable, handlePreviewDeliverable, handleReadDeliverablePiece } from "./server/open";
 import { mirrorQuestionMode } from "./server/question-mode";
 import { handleInstallSkill, handleReadSkill, handleSkillStatus, repairSkill } from "./server/skill";
+import { attachProgressTools, handleToolsStatus } from "./server/tool";
 import { handleDismissWhatsNew, handleGetWhatsNew } from "./server/whats-new";
-import { canOpenOnHost, dismissWhatsNew, getAttention, getDashboard, getLauncherStatus, getSkillStatus, getWhatsNew, installLauncher, installSkill, listFolders, readSkill, markPanelOpened, openDeliverable, previewDeliverable, readDeliverablePiece, setHistoryFolder } from "./shared/rpc";
+import { canOpenOnHost, dismissWhatsNew, getAttention, getDashboard, getLauncherStatus, getSkillStatus, getToolsStatus, getWhatsNew, installLauncher, installSkill, listFolders, readSkill, markPanelOpened, openDeliverable, previewDeliverable, readDeliverablePiece, setHistoryFolder } from "./shared/rpc";
 import { displaySettings, questionSettings } from "./shared/settings";
 
 export default function contribute(server: PluginServerContext) {
@@ -23,12 +24,14 @@ export default function contribute(server: PluginServerContext) {
   server.handle(readSkill, handleReadSkill);
   server.handle(listFolders, handleListFolders);
   server.handle(setHistoryFolder, handleSetHistoryFolder);
+  server.handle(getToolsStatus, handleToolsStatus);
   server.handle(getWhatsNew, handleGetWhatsNew);
   server.handle(dismissWhatsNew, handleDismissWhatsNew);
   // Settles a new install before any panel opens. Opening one makes a
   // worktree folder, which would look like an earlier version's.
   void handleGetWhatsNew().catch(() => {});
   void repairSkill();
+  attachProgressTools(server);
   server.registerSettings(displaySettings);
   const mirror = mirrorQuestionMode(server.registerSettings(questionSettings));
   return mirror.stop;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stevecastaneda/paseo-progress",
-  "version": "1.13.1",
-  "description": "A live progress dashboard per worktree for Paseo, drawn from a file agents write with the paseo-progress command.",
+  "version": "1.14.1",
+  "description": "A live progress dashboard per worktree for Paseo, drawn from a file agents write with the Progress tools or the paseo-progress command.",
   "license": "MIT",
   "author": "Steve Castaneda",
   "repository": {
@@ -50,8 +50,8 @@
     "postpack": "rm -rf dist"
   },
   "devDependencies": {
-    "@getpaseo/client": "0.13.0",
-    "@getpaseo/plugin": "0.13.0",
+    "@getpaseo/client": "0.14.0",
+    "@getpaseo/plugin": "0.14.0",
     "@tanstack/react-query": "^5.90.11",
     "@types/node": "^20.9.0",
     "@types/react": "~19.2.0",

package/paseo-plugin.json

@@ -6,7 +6,9 @@
     "images/2-ticket.png",
     "images/3-question.png",
     "images/4-pill.png",
-    "images/5-settings.png"
+    "images/5-settings.png",
+    "images/6-chat-rows.png",
+    "images/7-empty-tools-note.png"
   ],
   "requirements": {
     "paseo": ">=0.13.0"

package/server/cli.ts

@@ -494,6 +494,14 @@ const SHOW_SUMMARY = "Print the dashboard as text: what the user sees in the Pro
 const INSTALL_SUMMARY = "Write the paseo-progress launcher (default ~/.local/bin/paseo-progress). It runs this command from whichever copy of the plugin Paseo is running.";
 const DEFAULT_LAUNCHER = "~/.local/bin/paseo-progress";
 
+// The agent tools describe themselves with the summaries agents see in --help.
+export function commandSummary(name: string): string {
+  if (name === "show") return SHOW_SUMMARY;
+  const command = commands[name];
+  if (!command) throw new Error(`No command named ${name}.`);
+  return command.summary;
+}
+
 function help(): string {
   return [
     `Usage: ${USAGE_NAME} <command>`,

package/server/open.ts

@@ -8,8 +8,8 @@ import { promisify } from "node:util";
 import { findAttachment, type FolderEntry, imageMimeType, isPieced, type PiecedKind, previewKind, splitRef, textFormat, videoMimeType } from "../shared/attachments.ts";
 import { prepareMarkdown, previewText } from "../shared/markdown.ts";
 import { readProgress } from "./progress-file.ts";
-import { findRoot, outside } from "./paths.ts";
-import { findStore } from "./store.ts";
+import { findRoot, hasGitEntry, inGitFolder, outside } from "./paths.ts";
+import { findStore, git } from "./store.ts";
 
 export type Opener = (path: string) => Promise<void>;
 
@@ -127,7 +127,7 @@ export async function previewDeliverable(directory: string, id: string): Promise
     }
   }
   if (size > MAX_PREVIEW_BYTES) throw new Error(tooLarge(path, size));
-  if (kind === "html") return { kind, html: await inlineLocalFiles(await readFile(realTarget, "utf8"), dirname(realTarget), realRoot), bytes: size };
+  if (kind === "html") return { kind, html: await inlineLocalFiles(await readFile(realTarget, "utf8"), realTarget, realRoot), bytes: size };
   const data = await readFile(realTarget);
   return { kind, dataUri: `data:${imageMimeType(realTarget)};base64,${data.toString("base64")}`, bytes: size };
 }
@@ -146,8 +146,29 @@ async function listFolder(target: string): Promise<{ entries: FolderEntry[]; tru
 // The preview gets only the page, so the files beside it that it loads (its
 // screenshots, a script, a stylesheet) are written into it. Only files inside the
 // worktree, up to MAX_PREVIEW_BYTES in all; anything else is left as written and
-// fails to load. Web addresses are left alone.
-async function inlineLocalFiles(html: string, directory: string, root: string): Promise<string> {
+// fails to load. Web addresses are left alone. A cloned repo's page runs here,
+// so it must not read and send .env or .git files: it gets a file git says it
+// keeps, or, when git ignores the page, like an agent's report in .scratch, a
+// file in the page's own folder or below. Never one in a .git folder. When git
+// can't answer, as for a file in a submodule or when git fails, the file stays out.
+async function inlineLocalFiles(html: string, page: string, root: string): Promise<string> {
+  const directory = dirname(page);
+  const inRepo = hasGitEntry(root);
+  // -v -n prints a line for every path git answers for, so a git that fails
+  // with no answer never counts as "not ignored". The "./" stops git reading a
+  // name like ":(glob)x" as a pattern.
+  const ignoreCheck = async (path: string): Promise<"ignored" | "kept" | "unknown"> => {
+    if (!inRepo) return "kept";
+    const { code, stdout } = await git(root, ["check-ignore", "-v", "-n", "--", `./${relative(root, path).split(nodePath.sep).join("/")}`]);
+    if (!stdout.trim()) return "unknown";
+    return code === 0 ? "ignored" : code === 1 ? "kept" : "unknown";
+  };
+  const pageIgnored = (await ignoreCheck(page)) === "ignored";
+  const allowed = async (file: string) => {
+    if (inGitFolder(relative(root, file))) return false;
+    if ((await ignoreCheck(file)) === "kept") return true;
+    return pageIgnored && !outside(relative(directory, file));
+  };
   let room = MAX_PREVIEW_BYTES - Buffer.byteLength(html);
   const inline = async (url: string, encode: (data: Buffer, file: string) => string): Promise<string | null> => {
     if (!url || /^([a-z][a-z0-9+.-]*:|[/\\#?])/i.test(url)) return null;
@@ -155,6 +176,7 @@ async function inlineLocalFiles(html: string, directory: string, root: string):
       const file = await realpath(resolve(directory, decodeURI(url.replace(/[?#].*$/, ""))));
       const stats = await stat(file);
       if (outside(relative(root, file)) || !stats.isFile() || stats.size > room) return null;
+      if (!(await allowed(file))) return null;
       const encoded = encode(await readFile(file), file);
       if (encoded.length > room) return null;
       room -= encoded.length;

package/server/paths.ts

@@ -7,14 +7,26 @@ export function outside(inside: string): boolean {
   return inside === ".." || inside.startsWith(`..${sep}`) || isAbsolute(inside);
 }
 
-// The worktree root is the nearest directory with a `.git` entry (a folder in
-// a checkout, a file in a linked worktree). Outside git, use the directory.
-// The command and the panel both start from here, so a Paseo project set at a
-// subfolder of the repo still reads the file the agent writes.
+// Whether a path from relative(root, target) is in a .git folder, a nested
+// checkout's included. Windows writes either separator, and Windows and macOS
+// match names in any case.
+export function inGitFolder(inside: string): boolean {
+  return inside.split(/[\\/]/).some((name) => name.toLowerCase() === ".git");
+}
+
+// A `.git` entry: a folder in a checkout, a file in a linked worktree.
+export function hasGitEntry(directory: string): boolean {
+  return existsSync(join(directory, ".git"));
+}
+
+// The worktree root is the nearest directory with a `.git` entry. Outside git,
+// use the directory. The command and the panel both start from here, so a
+// Paseo project set at a subfolder of the repo still reads the file the agent
+// writes.
 export function findRoot(cwd: string): string {
   let directory = resolve(cwd);
   while (true) {
-    if (existsSync(join(directory, ".git"))) return directory;
+    if (hasGitEntry(directory)) return directory;
     const parent = dirname(directory);
     if (parent === directory) return resolve(cwd);
     directory = parent;