pim-agent 0.9.0 → 0.11.0

package/bin/pim.ts

@@ -24,7 +24,7 @@ import { themeCliArgs } from "#tui/themes/themeCliArgs";
 // `_init` must stay first: it installs the runtime guard.
 const extensionFactories: readonly PimInlineExtension[] = [
   { name: "_init", factory: init },
-  ...CoreExtensions.list,
+  ...CoreExtensions.list("terminal"),
   { name: "command-picker", factory: commandPicker },
   { name: "file-picker", factory: filePicker },
   { name: "footer", factory: footer },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pim-agent",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "A batteries-included distro of Pi, accessible in your terminal, browser and Telegram.",
   "license": "MIT",
   "type": "module",
@@ -52,11 +52,10 @@
     "check": "bun scripts/check.ts",
     "gen:brand": "bun scripts/brand/generate.ts",
     "gen:hero": "bun scripts/hero/generate.ts",
-    "web:build": "cd packages/web && vite build",
+    "web:build": "cd packages/web && NODE_ENV=production vite build",
     "web:dev": "cd packages/web && vite"
   },
   "devDependencies": {
-    "@fontsource/commit-mono": "^5.3.0",
     "@happy-dom/global-registrator": "^20.14.0",
     "@iconify-json/griddy-icons": "^1.2.0",
     "@iconify-json/solar": "^1.2.10",

package/packages/core/src/extensions/CoreExtensions.ts

@@ -7,6 +7,7 @@ import {
   ExtensionToggles,
   type PimExtensionName,
 } from "../shared/ExtensionToggles";
+import type { Surface } from "../shared/Surface";
 import applyPatch from "./apply-patch/index";
 import bash from "./bash/index";
 import edit from "./edit/index";
@@ -26,23 +27,25 @@ export type PimInlineExtension = {
 };
 
 // Enumerated, never globbed: the published tarball must not depend on a directory scan.
-const list: readonly PimInlineExtension[] = [
-  { name: "apply-patch", factory: applyPatch },
-  { name: "bash", factory: bash },
-  { name: "edit", factory: edit },
-  { name: "glob", factory: glob },
-  { name: "grep", factory: grep },
-  { name: "read", factory: read },
-  { name: "subagent", factory: subagent },
-  { name: "system-prompt", factory: systemPrompt },
-  { name: "todo", factory: todo },
-  { name: "web-fetch", factory: webFetch },
-  { name: "web-search", factory: webSearch },
-  { name: "write", factory: write },
-];
+function list(surface?: Surface): readonly PimInlineExtension[] {
+  return [
+    { name: "apply-patch", factory: applyPatch },
+    { name: "bash", factory: bash },
+    { name: "edit", factory: edit },
+    { name: "glob", factory: glob },
+    { name: "grep", factory: grep },
+    { name: "read", factory: read },
+    { name: "subagent", factory: subagent },
+    { name: "system-prompt", factory: systemPrompt(surface) },
+    { name: "todo", factory: todo },
+    { name: "web-fetch", factory: webFetch },
+    { name: "web-search", factory: webSearch },
+    { name: "write", factory: write },
+  ];
+}
 
-function gated(): InlineExtension[] {
-  return list.map(({ name, factory }) => ({
+function gated(surface?: Surface): InlineExtension[] {
+  return list(surface).map(({ name, factory }) => ({
     name,
     factory: ExtensionToggles.gate(name, factory),
   }));

package/packages/core/src/extensions/apply-patch/render.ts

@@ -3,11 +3,12 @@ import { Paths } from "../../shared/Paths";
 import { PatchSummary } from "../../shared/PatchSummary";
 import type { ToolViewInput } from "../../shared/Tools";
 import { DiffBlocks } from "../../view/DiffBlocks";
+import { MovePath } from "../../view/MovePath";
 import type { Span, ToolIcon, ToolView, ViewBlock } from "../../view/ViewBlock";
 import type { ApplyEntry } from "./executor";
 import { type applyPatchSchema, prepareApplyPatchArguments } from "./schema";
 
-const ARROW = "➝";
+const ARROW = MovePath.ARROW;
 
 export type ApplyPatchDetails = {
   readonly entries?: readonly ApplyEntry[];
@@ -152,65 +153,25 @@ function sectionBlock(entry: EntryView): ViewBlock {
 }
 
 function moveTitle(oldPath: string, newPath: string): readonly Span[] {
-  const oldParts = oldPath.split("/");
-  const newParts = newPath.split("/");
-  let commonPrefix = 0;
-
-  while (
-    commonPrefix < oldParts.length &&
-    commonPrefix < newParts.length &&
-    oldParts[commonPrefix] === newParts[commonPrefix]
-  ) {
-    commonPrefix += 1;
-  }
-
-  let commonSuffix = 0;
-  while (
-    commonSuffix < oldParts.length - commonPrefix &&
-    commonSuffix < newParts.length - commonPrefix &&
-    oldParts[oldParts.length - commonSuffix - 1] ===
-      newParts[newParts.length - commonSuffix - 1]
-  ) {
-    commonSuffix += 1;
-  }
-
-  const oldChanged = oldParts.slice(
-    commonPrefix,
-    oldParts.length - commonSuffix
-  );
-  const newChanged = newParts.slice(
-    commonPrefix,
-    newParts.length - commonSuffix
-  );
-
-  if (
-    oldChanged.length > 0 &&
-    newChanged.length > 0 &&
-    (commonPrefix > 0 ||
-      commonSuffix > 0 ||
-      (oldParts.length === 1 && newParts.length === 1))
-  ) {
-    const prefix =
-      commonPrefix > 0 ? `${oldParts.slice(0, commonPrefix).join("/")}/` : "";
-    const suffix =
-      commonSuffix > 0 ? `/${oldParts.slice(-commonSuffix).join("/")}` : "";
+  const folded = MovePath.fold(oldPath, newPath);
 
+  if (folded === undefined) {
     return [
-      { text: prefix },
-      { text: "{", tone: "dim" },
-      { text: oldChanged.join("/"), tone: "dim", strike: true },
-      { text: ` ${ARROW} `, tone: "dim" },
-      { text: newChanged.join("/"), tone: "title" },
-      { text: "}", tone: "dim" },
-      { text: suffix, tone: "title" },
+      { text: oldPath, tone: "dim", strike: true },
+      { text: " " },
+      { text: ARROW, tone: "dim" },
+      { text: " " },
+      { text: newPath, tone: "title" },
     ];
   }
 
   return [
-    { text: oldPath, tone: "dim", strike: true },
-    { text: " " },
-    { text: ARROW, tone: "dim" },
-    { text: " " },
-    { text: newPath, tone: "title" },
+    { text: folded.prefix },
+    { text: "{", tone: "dim" },
+    { text: folded.from, tone: "dim", strike: true },
+    { text: ` ${ARROW} `, tone: "dim" },
+    { text: folded.to, tone: "title" },
+    { text: "}", tone: "dim" },
+    { text: folded.suffix, tone: "title" },
   ];
 }

package/packages/core/src/extensions/bash/index.ts

@@ -42,7 +42,8 @@ export default function (pi: ExtensionAPI): void {
     name: "bash",
     label: "bash",
     description:
-      "Execute a bash command in the cwd. " +
+      "Execute a bash command in the cwd from <environment>. " +
+      "Never prefix `cd <cwd> &&`; pass paths relative to cwd or absolute. " +
       "Returns exit code, signal (if any), and stdout/stderr captured separately. " +
       "Stdout that is a png/jpeg/gif/webp is returned as a picture. " +
       "Prefer commands that emit only what you need; keep output as small as possible.",

package/packages/core/src/extensions/bash/run.ts

@@ -14,6 +14,12 @@ type Reader = ReadableStreamDefaultReader<Uint8Array>;
 
 const activePids = new Set<number>();
 
+const COMMAND_VAR = "PIM_BASH_COMMAND";
+// argv is what `pkill -f`/`pgrep -f` match, so a command naming its own target would
+// signal this shell before its target. The env hands it over out of argv's reach, and
+// the unset keeps it out of every child's environment too.
+const RUNNER = `__pim_command=$${COMMAND_VAR}; unset ${COMMAND_VAR}; eval "$__pim_command"`;
+
 export function killAllActiveBashGroups(sig: NodeJS.Signals = "SIGTERM"): void {
   for (const pid of activePids) {
     killGroup(pid, sig);
@@ -97,11 +103,11 @@ export async function runBashCommand(
 
   // setsid gives the tree its own process group (pgid == proc.pid) so the whole tree can be signalled.
   const proc = Bun.spawn({
-    cmd: ["setsid", "bash", "-lc", command],
+    cmd: ["setsid", "bash", "-lc", RUNNER],
     cwd,
     stdout: "pipe",
     stderr: "pipe",
-    env: { ...process.env },
+    env: { ...process.env, [COMMAND_VAR]: command },
   });
   if (proc.pid !== undefined) {
     activePids.add(proc.pid);

package/packages/core/src/extensions/system-prompt/index.ts

@@ -1,28 +1,51 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type {
+  ExtensionAPI,
+  ExtensionFactory,
+} from "@earendil-works/pi-coding-agent";
 import { formatSkillsForPrompt } from "@earendil-works/pi-coding-agent";
-import { buildSystemPrompt } from "./prompt";
 
-export default function (pi: ExtensionAPI): void {
-  pi.on("before_agent_start", (event, ctx) => {
-    const {
-      cwd,
-      contextFiles,
-      skills,
-      promptGuidelines,
-      appendSystemPrompt,
-      customPrompt,
-    } = event.systemPromptOptions;
-    return {
-      systemPrompt: buildSystemPrompt({
-        model: ctx.model,
+import type { Surface } from "../../shared/Surface";
+import { buildSystemPrompt, formatDatetime } from "./prompt";
+
+const DATETIME_MESSAGE_TYPE = "pim-datetime";
+
+export default function (surface?: Surface): ExtensionFactory {
+  return (pi: ExtensionAPI): void => {
+    // On submit rather than in `before_agent_start`, which can only append
+    // behind the user's message.
+    pi.on("input", () => {
+      pi.sendMessage(
+        {
+          customType: DATETIME_MESSAGE_TYPE,
+          content: `<datetime>${formatDatetime(new Date())}</datetime>`,
+          display: false,
+        },
+        { triggerTurn: false }
+      );
+      return { action: "continue" };
+    });
+    pi.on("before_agent_start", (event, ctx) => {
+      const {
         cwd,
-        contextFiles: contextFiles ?? [],
-        skillsBlock:
-          skills && skills.length > 0 ? formatSkillsForPrompt(skills) : "",
-        toolGuidelines: promptGuidelines ?? [],
+        contextFiles,
+        skills,
+        promptGuidelines,
         appendSystemPrompt,
         customPrompt,
-      }),
-    };
-  });
+      } = event.systemPromptOptions;
+      return {
+        systemPrompt: buildSystemPrompt({
+          model: ctx.model,
+          cwd,
+          contextFiles: contextFiles ?? [],
+          skillsBlock:
+            skills && skills.length > 0 ? formatSkillsForPrompt(skills) : "",
+          toolGuidelines: promptGuidelines ?? [],
+          appendSystemPrompt,
+          customPrompt,
+          ...(surface === undefined ? {} : { surface }),
+        }),
+      };
+    });
+  };
 }

package/packages/core/src/extensions/system-prompt/prompt.ts

@@ -1,5 +1,7 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 
+import type { Surface } from "../../shared/Surface";
+
 type BuildOptions = {
   readonly model?: ExtensionContext["model"];
   readonly cwd: string;
@@ -12,6 +14,7 @@ type BuildOptions = {
   readonly appendSystemPrompt?: string;
   readonly customPrompt?: string;
   readonly os?: string;
+  readonly surface?: Surface;
 };
 
 type RunCommand = (cmd: ReadonlyArray<string>) => string | undefined;
@@ -40,7 +43,7 @@ export function buildSystemPrompt(opts: BuildOptions): string {
     sections.push(
       [
         "<system_instructions>",
-        "You are pim (Pi IMproved), a Bun-native, opinionated extension pack for the [pi agent harness](https://pi.dev/).",
+        "You are Pim (Pi IMproved), a batteries-included agent built on the Pi harness.",
         ...opts.toolGuidelines.map((g) => `- ${g}`),
         ...dynamicGuidelines().map((g) => `- ${g}`),
         "</system_instructions>",
@@ -57,7 +60,7 @@ export function buildSystemPrompt(opts: BuildOptions): string {
       `- cwd: ${opts.cwd}`,
       `- os: ${opts.os ?? describeOs()}`,
       `- model: ${model}`,
-      `- datetime: ${formatDatetime(new Date())}`,
+      ...(opts.surface ? [`- surface: ${opts.surface}`] : []),
       "</environment>",
     ].join("\n")
   );
@@ -206,7 +209,7 @@ function unquoteValue(value: string): string {
   return quote === "'" ? unquoted : unquoted.replace(/\\(["\\$`])/g, "$1");
 }
 
-function formatDatetime(d: Date): string {
+export function formatDatetime(d: Date): string {
   const pad = (n: number): string => String(n).padStart(2, "0");
   const offsetMinutes = -d.getTimezoneOffset();
   const sign = offsetMinutes >= 0 ? "+" : "-";

package/packages/core/src/picker/PickerService.ts

@@ -1,4 +1,7 @@
 import { type AgentSession, loadSkills } from "@earendil-works/pi-coding-agent";
+import { existsSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join, resolve } from "node:path";
 
 import { loadRelative } from "./catalog";
 import { rankCommands } from "./commandRanker";
@@ -15,6 +18,25 @@ export type PickerServiceDeps = {
 
 const DEFAULT_LIMIT = 50;
 
+/**
+ * The `.agents/skills` roots pi reads and `loadSkills` does not: every one from
+ * the cwd up to the repository root, plus the user's own.
+ */
+function agentsSkillDirs(cwd: string): string[] {
+  const dirs: string[] = [];
+  let dir = resolve(cwd);
+  for (;;) {
+    dirs.push(join(dir, ".agents", "skills"));
+    const parent = dirname(dir);
+    if (existsSync(join(dir, ".git")) || parent === dir) {
+      break;
+    }
+    dir = parent;
+  }
+  dirs.push(join(process.env.HOME ?? homedir(), ".agents", "skills"));
+  return dirs;
+}
+
 /** Answers one session's picker queries against the machine the agent runs on. */
 export class PickerService {
   private readonly deps: PickerServiceDeps;
@@ -81,7 +103,7 @@ export class PickerService {
       const { skills } = loadSkills({
         cwd,
         agentDir: this.deps.agentDir,
-        skillPaths: [],
+        skillPaths: agentsSkillDirs(cwd),
         includeDefaults: true,
       });
       return skills.map((skill) => ({

package/packages/core/src/picker/token.ts

@@ -7,12 +7,12 @@ export type PickerToken = {
 };
 
 export const AT_PREFIX = /(?:^|\s)@(\S*)$/;
-export const SLASH_PREFIX = /^\/(\S*)$/;
+export const SLASH_PREFIX = /(?:^|\s)\/(\S*)$/;
 
-/** Offset of the sigil in an `AT_PREFIX` match, which also swallows the whitespace before it. */
+/** Offset of the sigil in a match that also swallows the whitespace before it. */
 export function sigilOffset(match: RegExpMatchArray): number {
   const matched = match[0] ?? "";
-  return (match.index ?? 0) + (matched.startsWith("@") ? 0 : 1);
+  return (match.index ?? 0) + (/^\s/.test(matched) ? 1 : 0);
 }
 
 export function isDirectoryItem(item: { readonly label: string }): boolean {
@@ -28,7 +28,11 @@ export function activeToken(
 
   const slash = SLASH_PREFIX.exec(beforeCaret);
   if (slash) {
-    return { kind: "command", query: slash[1] ?? "", start: lineStart };
+    return {
+      kind: "command",
+      query: slash[1] ?? "",
+      start: lineStart + sigilOffset(slash),
+    };
   }
 
   const at = AT_PREFIX.exec(beforeCaret);
@@ -59,9 +63,12 @@ export function applyCompletion(
   token: PickerToken,
   item: { readonly value: string; readonly label: string }
 ): Completion {
-  const inserted = token.kind === "file" ? `@${item.value}` : `${item.value} `;
   const head = text.slice(0, token.start);
   const tail = text.slice(caret);
+  const inserted =
+    token.kind === "file"
+      ? `@${item.value}`
+      : `${item.value}${/^\s/.test(tail) ? "" : " "}`;
   return {
     text: `${head}${inserted}${tail}`,
     caret: head.length + inserted.length,

package/packages/core/src/session/EventLog.ts

@@ -3,8 +3,9 @@ import type { BunFile } from "bun";
 import type { FileEntry, SessionHeader } from "@earendil-works/pi-coding-agent";
 import { parseSessionEntries } from "@earendil-works/pi-coding-agent";
 
-import { Attachments } from "../attachments/Attachments";
-import { MessageText } from "./MessageText";
+import { SessionDigest, type Durable } from "./SessionDigest";
+
+export type { SessionDigest } from "./SessionDigest";
 
 async function ifPresent<T>(read: () => Promise<T>, absent: T): Promise<T> {
   try {
@@ -28,8 +29,6 @@ type Cursor = {
   readonly seq: number;
 };
 
-const PROBE_LINES = 16;
-
 const PROBE_LIMIT = 16 * 1024 * 1024;
 
 const PROBE_CHUNK = 8 * 1024;
@@ -37,19 +36,6 @@ const PROBE_CHUNK_MAX = 256 * 1024;
 
 const EMPTY = new Uint8Array();
 
-const TAIL_BYTES = 64 * 1024;
-const TAIL_LINES = 10;
-
-const TITLE_LIMIT = 120;
-
-/** What the session catalogue shows for one file without opening a session. */
-export type SessionDigest = {
-  /** The first user message, trimmed; absent when the session has none yet. */
-  readonly title?: string;
-  /** When the agent last wrote; it moves with an in-flight turn, so read it before starting one. */
-  readonly settledAt?: number;
-};
-
 function isHeader(entry: FileEntry): entry is SessionHeader {
   return entry.type === "session";
 }
@@ -112,17 +98,23 @@ export class EventLog {
     return this.cursor.seq;
   }
 
-  /** Title and settle time for the catalogue, read from the two ends of the file. */
+  /**
+   * The name pi's own `/name` writes: the last `session_info` entry wins, and an
+   * empty one clears it. Appended rather than replaced, so it is found by reading
+   * the whole file — the one unbounded read the catalogue makes, and the only
+   * reason `SessionDigest` takes a whole file rather than a bounded head and tail.
+   */
+  public async name(): Promise<string | undefined> {
+    const body = await durableBytes(Bun.file(this.path));
+    return body === undefined ? undefined : SessionDigest.nameOf(body);
+  }
+
+  /** Title and settle time for the catalogue, without opening a session. */
   public async digest(): Promise<SessionDigest> {
-    const file = Bun.file(this.path);
-    const [title, settledAt] = await Promise.all([
-      firstUserMessage(file),
-      settleTime(file),
-    ]);
-    return {
-      ...(title === undefined ? {} : { title }),
-      ...(settledAt === undefined ? {} : { settledAt }),
-    };
+    const body = await durableBytes(Bun.file(this.path));
+    return body === undefined
+      ? {}
+      : SessionDigest.of(SessionDigest.partsOf(body));
   }
 }
 
@@ -158,56 +150,7 @@ async function* headLines(
   }
 }
 
-async function settleTime(file: BunFile): Promise<number | undefined> {
-  const near = Math.max(0, file.size - TAIL_BYTES);
-  const lines = await tailLines(file, near);
-  const found = lastAgentTime(lines);
-  if (found !== undefined || near === 0 || lines.length >= TAIL_LINES) {
-    return found;
-  }
-  return lastAgentTime(await tailLines(file, 0));
-}
-
-async function tailLines(file: BunFile, from: number): Promise<string[]> {
-  const text = await ifPresent(() => file.slice(from).text(), "");
-  const lines = text.split("\n");
-  lines.pop();
-  if (from > 0) {
-    lines.shift();
-  }
-  return lines.slice(-TAIL_LINES).reverse();
-}
-
-function lastAgentTime(lines: readonly string[]): number | undefined {
-  for (const line of lines) {
-    const entry = parseSessionEntries(line)[0];
-    if (entry?.type !== "message") {
-      continue;
-    }
-    const role = entry.message.role;
-    if (role === "assistant" || role === "toolResult") {
-      const at = Date.parse(entry.timestamp);
-      return Number.isNaN(at) ? undefined : at;
-    }
-  }
-  return undefined;
-}
-
-async function firstUserMessage(file: BunFile): Promise<string | undefined> {
-  for await (const line of headLines(file, PROBE_LINES)) {
-    const entry = parseSessionEntries(line)[0];
-    if (entry?.type !== "message" || entry.message.role !== "user") {
-      continue;
-    }
-    const said = Attachments.parse(MessageText.textOf(entry.message.content));
-    const text =
-      said.text.trim() ||
-      said.files.map((file) => Attachments.nameOf(file.path)).join(", ");
-    if (text !== "") {
-      return text.length > TITLE_LIMIT
-        ? `${text.slice(0, TITLE_LIMIT).trimEnd()}…`
-        : text;
-    }
-  }
-  return undefined;
+async function durableBytes(file: BunFile): Promise<Durable | undefined> {
+  const read = await ifPresent(() => file.bytes(), EMPTY);
+  return SessionDigest.durable(read);
 }