pi-pier 0.3.0 → 0.4.1

package/src/efficiency-config-io.ts

@@ -1,53 +0,0 @@
-import { existsSync, readFileSync } from 'node:fs';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-
-export interface PiCompactionSettings {
-  enabled?: boolean;
-  keepRecentTokens?: number;
-}
-
-function readCompactionSettings(filePath: string): PiCompactionSettings {
-  if (!existsSync(filePath)) return {};
-  try {
-    const parsed: unknown = JSON.parse(readFileSync(filePath, 'utf8'));
-    if (!parsed || typeof parsed !== 'object' || !('compaction' in parsed)) return {};
-    const compaction = parsed.compaction;
-    if (!compaction || typeof compaction !== 'object') return {};
-    const result: PiCompactionSettings = {};
-    if ('enabled' in compaction && typeof compaction.enabled === 'boolean') result.enabled = compaction.enabled;
-    if ('keepRecentTokens' in compaction && typeof compaction.keepRecentTokens === 'number') {
-      result.keepRecentTokens = compaction.keepRecentTokens;
-    }
-    return result;
-  } catch {
-    return {};
-  }
-}
-
-function defaultAgentDir(): string {
-  return process.env.PI_CODING_AGENT_DIR ?? join(homedir(), '.pi', 'agent');
-}
-
-/** Read pi's own compaction settings (global, plus the project file when trusted). */
-export function loadPiNativeCompactionSettings(opts: {
-  cwd?: string;
-  isProjectTrusted?: boolean;
-  agentDir?: string;
-} = {}): PiCompactionSettings {
-  const cwd = opts.cwd ?? process.cwd();
-  const globalSettings = readCompactionSettings(join(opts.agentDir ?? defaultAgentDir(), 'settings.json'));
-  if (!opts.isProjectTrusted) return globalSettings;
-  const projectSettings = readCompactionSettings(join(cwd, '.pi', 'settings.json'));
-  return { ...globalSettings, ...projectSettings };
-}
-
-export function readJsonConfig(filePath: string, onError?: (error: unknown) => void): unknown | undefined {
-  if (!existsSync(filePath)) return undefined;
-  try {
-    return JSON.parse(readFileSync(filePath, 'utf8')) as unknown;
-  } catch (error) {
-    onError?.(error);
-    return undefined;
-  }
-}

package/src/focus-poller.ts

@@ -1,244 +0,0 @@
-/**
- * D-4: herdr 0.9.0 resolved mouse focus client-side, so `pane.focused` never reached plugins.
- * Each pier pane sampled `layout.export` and replayed `pane.focused` into heat-reflow.mjs.
- *
- * Herdr 0.9.1 delivers `pane.focused` to the workbench hook. Default polling is therefore off
- * (0 ms) on ≥0.9.1 so a click is not followed by a second reflow ~8s later. Herdr <0.9.1 keeps
- * the 1500ms sampler. `PIER_FOCUS_POLL_MS` overrides either default; 0 disables.
- */
-import { spawn } from 'node:child_process';
-import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-/** Poll cadence for older Herdr (< 0.9.1). */
-export const FOCUS_POLL_DEFAULT_MS = 1500;
-/** Herdr 0.9.1+: native pane.focused is authoritative; default poller off to avoid a delayed second reflow. */
-export const FOCUS_POLL_HERDR_091_MS = 0;
-
-/** Check if Herdr server version is 0.9.1 or later. */
-export function isHerdr091OrLater(version?: string | null): boolean {
-  if (!version) return false;
-  const m = /^(\d+)\.(\d+)\.(\d+)/.exec(version.trim());
-  if (!m) return false;
-  const major = Number(m[1]);
-  const minor = Number(m[2]);
-  const patch = Number(m[3]);
-  if (major > 0) return true;
-  if (minor > 9) return true;
-  if (minor === 9 && patch >= 1) return true;
-  return false;
-}
-
-/** Determine default poll cadence based on Herdr server version. */
-export function resolveDefaultFocusPollMs(herdrVersion?: string | null): number {
-  return isHerdr091OrLater(herdrVersion) ? FOCUS_POLL_HERDR_091_MS : FOCUS_POLL_DEFAULT_MS;
-}
-/**
- * Minimum gap between two reflow triggers. Re-clicking the same pane quickly must not spawn a
- * process per click; the workbench debounces per tab (150 ms) on top of this.
- */
-export const FOCUS_FIRE_MIN_INTERVAL_MS = 700;
-
-export interface FocusSample {
-  /** Pane focused in the sampled tab (null when the server reported no focus). */
-  readonly focusedPaneId: string | null;
-  /** Panes currently in that tab, used to tell a click apart from a spawn auto-focus. */
-  readonly paneIds: readonly string[];
-}
-
-export interface FocusPollerState {
-  readonly lastFocusedPaneId: string | null;
-  readonly lastPaneIds: readonly string[];
-  readonly lastFireAt: number;
-}
-
-/** Minimal flatten of a herdr layout tree (`{type:'pane',pane_id}` / `{type:'split',first,second}`). */
-export function collectPaneIds(root: unknown): string[] {
-  const out: string[] = [];
-  const walk = (node: unknown): void => {
-    if (node === null || typeof node !== 'object') return;
-    const n = node as { pane_id?: unknown; first?: unknown; second?: unknown };
-    if (typeof n.pane_id === 'string') {
-      out.push(n.pane_id);
-      return;
-    }
-    walk(n.first);
-    walk(n.second);
-  };
-  walk(root);
-  return out;
-}
-
-/** `layout.export` payload → sample. `focusedPaneId` is optional for older clients. */
-export function parseFocusSample(
-  layout: { root: unknown; focusedPaneId?: string | null } | null | undefined,
-): FocusSample | null {
-  if (!layout || !('root' in layout)) return null;
-  const paneIds = collectPaneIds(layout.root);
-  const focused = typeof layout.focusedPaneId === 'string' ? layout.focusedPaneId : null;
-  return { focusedPaneId: focused, paneIds };
-}
-
-export interface FocusTick {
-  readonly fire: boolean;
-  readonly cause: 'user' | null;
-  readonly state: FocusPollerState;
-}
-
-/**
- * Decide whether one sample should trigger a reflow.
- *
- * Fires only on a *transition* into "I am focused" (so a steady focus never re-triggers) and at most
- * once per `minIntervalMs`. `cause` is 'user' when the pane set did not change in the same sample:
- * a click moves focus and nothing else, whereas a spawn auto-focus always comes with a new pane.
- * The workbench uses that distinction for its 3 s pane-age whitelist (F1: a freshly created pane
- * must not grab the layout through an automatic focus).
- */
-export function planFocusTick(opts: {
-  myPaneId: string;
-  sample: FocusSample;
-  prev: FocusPollerState | null;
-  now: number;
-  minIntervalMs?: number;
-}): FocusTick {
-  const minInterval = opts.minIntervalMs ?? FOCUS_FIRE_MIN_INTERVAL_MS;
-  const prev = opts.prev;
-  const next: FocusPollerState = {
-    lastFocusedPaneId: opts.sample.focusedPaneId,
-    lastPaneIds: opts.sample.paneIds,
-    lastFireAt: prev?.lastFireAt ?? 0,
-  };
-  const noFire = (): FocusTick => ({ fire: false, cause: null, state: next });
-
-  if (opts.myPaneId === '') return noFire();
-  // First sample only records the baseline: a pi that starts in the focused pane must not reflow on
-  // startup (that is not a click, and it would fight whatever layout the user had).
-  if (prev === null) return noFire();
-  if (opts.sample.focusedPaneId !== opts.myPaneId) return noFire();
-  if (prev.lastFocusedPaneId === opts.myPaneId) return noFire();
-  if (opts.now - prev.lastFireAt < minInterval) return noFire();
-
-  const setUnchanged =
-    prev.lastPaneIds.length === opts.sample.paneIds.length &&
-    prev.lastPaneIds.every((id, i) => id === opts.sample.paneIds[i]);
-  return {
-    fire: true,
-    cause: setUnchanged ? 'user' : null,
-    state: { ...next, lastFireAt: opts.now },
-  };
-}
-
-/* ─────────────────────────── runner ─────────────────────────── */
-
-export interface FocusPollerDeps {
-  /** Layout of the caller's own tab (the client already exposes `layout.export`). */
-  sample(): Promise<FocusSample | null>;
-  /** Replay a pane.focused reflow for `paneId`. Must never throw. */
-  fire(paneId: string, cause: 'user' | null): void;
-  myPaneId: string;
-  intervalMs?: number;
-  minIntervalMs?: number;
-  now?: () => number;
-  setIntervalFn?: (fn: () => void, ms: number) => NodeJS.Timeout;
-  clearIntervalFn?: (handle: NodeJS.Timeout) => void;
-  /** Diagnostics only: polling failures are expected while herdr restarts. */
-  onError?: (err: unknown) => void;
-}
-
-export interface FocusPoller {
-  /** One sampling pass (exposed for tests; the interval calls the same function). */
-  tick(): Promise<void>;
-  stop(): void;
-}
-
-export function startFocusPoller(deps: FocusPollerDeps): FocusPoller {
-  const intervalMs = deps.intervalMs ?? FOCUS_POLL_DEFAULT_MS;
-  const now = deps.now ?? (() => Date.now());
-  const setIntervalFn = deps.setIntervalFn ?? ((fn, ms) => setInterval(fn, ms));
-  const clearIntervalFn =
-    deps.clearIntervalFn ?? ((handle: NodeJS.Timeout) => { clearInterval(handle); });
-  let state: FocusPollerState | null = null;
-  let inFlight = false;
-  let stopped = false;
-  let handle: NodeJS.Timeout | null = null;
-
-  async function tick(): Promise<void> {
-    if (stopped || inFlight) return;
-    inFlight = true;
-    try {
-      const sample = await deps.sample();
-      if (sample === null) return;
-      const decision = planFocusTick({
-        myPaneId: deps.myPaneId,
-        sample,
-        prev: state,
-        now: now(),
-        minIntervalMs: deps.minIntervalMs,
-      });
-      state = decision.state;
-      if (decision.fire) deps.fire(deps.myPaneId, decision.cause);
-    } catch (err) {
-      // A failed sample must not advance the baseline: the next tick re-reads the layout.
-      deps.onError?.(err);
-    } finally {
-      inFlight = false;
-    }
-  }
-
-  if (intervalMs > 0) {
-    handle = setIntervalFn(() => { void tick(); }, intervalMs);
-    handle.unref?.(); // never keep pi's event loop alive on our account
-  }
-
-  return {
-    tick,
-    stop(): void {
-      stopped = true;
-      if (handle !== null) {
-        clearIntervalFn(handle);
-        handle = null;
-      }
-    },
-  };
-}
-
-/** The workbench's reflow entry point; overridable for relocated checkouts. */
-export function reflowScriptPath(env: NodeJS.ProcessEnv = process.env): string {
-  const root = env.PIER_WORKBENCH_ROOT?.trim();
-  if (root) return join(root, 'scripts', 'heat-reflow.mjs');
-  // packages/pier-ext/src/focus-poller.ts -> packages/pier-workbench/scripts/heat-reflow.mjs
-  return join(dirname(fileURLToPath(import.meta.url)), '..', '..', 'pier-workbench', 'scripts', 'heat-reflow.mjs');
-}
-
-export interface SpawnReflowOpts {
-  paneId: string;
-  cause: 'user' | null;
-  env?: NodeJS.ProcessEnv;
-  /** Injection seam for tests (defaults to child_process.spawn). */
-  spawnFn?: typeof spawn;
-}
-
-/**
- * Fire-and-forget replay of the `pane.focused` hook.
- * Why a child process: it is exactly how herdr runs the hook, so the workbench script keeps its own
- * event parsing, debounce and state file — pier never duplicates layout logic.
- */
-export function spawnReflow(opts: SpawnReflowOpts): void {
-  const env = opts.env ?? process.env;
-  const spawnFn = opts.spawnFn ?? spawn;
-  const payload = JSON.stringify({
-    event: 'pane_focused',
-    type: 'pane_focused',
-    data: { type: 'pane_focused', pane_id: opts.paneId, cause: opts.cause },
-  });
-  try {
-    const child = spawnFn(process.execPath, [reflowScriptPath(env)], {
-      env: { ...env, HERDR_PLUGIN_EVENT: 'pane.focused', HERDR_PLUGIN_EVENT_JSON: payload },
-      stdio: 'ignore',
-    });
-    child.on?.('error', () => { /* Missing script / dead exec: polling must never break pi. */ });
-    child.unref?.();
-  } catch {
-    /* Best-effort: focus heat is a comfort feature; the click still focuses the pane. */
-  }
-}

package/src/git-adapter.ts

@@ -1,113 +0,0 @@
-import { execFile as nodeExecFile } from 'node:child_process'
-import { promisify } from 'node:util'
-import { runtimePolicy } from './runtime-policy.ts'
-
-const execFile = promisify(nodeExecFile)
-
-export interface GitResult {
-  readonly stdout: string
-  readonly stderr: string
-}
-
-export interface GitError extends Error {
-  readonly code?: string | number
-  readonly stdout?: string
-  readonly stderr?: string
-}
-
-/**
- * Injectable execFile used by NodeGitAdapter.
- * Why: tests drive git without a real process.
- */
-export type GitExecFile = (
-  file: string,
-  args: readonly string[],
-  options: { timeout: number; encoding: 'utf8'; maxBuffer: number },
-) => Promise<{ stdout: string; stderr: string }>;
-
-/**
- * Output ceiling for one git call. `execFile` defaults to 1MB, which a large checkout exceeds
- * (`status --porcelain` on a repo with tens of thousands of untracked files, or `diff --stat`
- * across a wide change): the call then fails with ENOBUFS, callers normalize it to null, and the
- * user sees a silently missing stat line — or "failed to create worktree" for a worktree that was
- * in fact created. 64MB bounds memory without hitting realistic repositories.
- */
-const GIT_MAX_BUFFER = 64 * 1024 * 1024;
-
-/**
- * Minimal Git adapter for worktree and status operations.
- *
- * Why: Centralizes platform-specific git executable resolution, timeout policy,
- * and error normalization; makes tests independent of real git processes.
- */
-export interface GitAdapter {
-  /**
-   * List worktrees in porcelain format.
-   * Returns stdout containing worktree entries.
-   */
-  listWorktrees(cwd: string): Promise<GitResult>
-
-  /**
-   * Get status of worktree in short format.
-   * Returns stdout containing status entries.
-   */
-  status(cwd: string): Promise<GitResult>
-
-  /**
-   * Run an arbitrary git command in `cwd` (`git -C <cwd> ...args`).
-   * Throws a GitError on failure/timeout — callers that want "null on error"
-   * (isolate sweep, placement) catch at the call site.
-   */
-  run(cwd: string, args: readonly string[]): Promise<GitResult>
-}
-export class NodeGitAdapter implements GitAdapter {
-  private readonly gitExecutable: string
-  private readonly timeoutMs: number
-  private readonly exec: GitExecFile
-
-  constructor(
-    gitExecutable: string = 'git',
-    timeoutMs: number = runtimePolicy.gitTimeoutMs,
-    exec: GitExecFile = execFile as unknown as GitExecFile,
-  ) {
-    this.gitExecutable = gitExecutable
-    this.timeoutMs = timeoutMs
-    this.exec = exec
-  }
-
-  listWorktrees(cwd: string): Promise<GitResult> {
-    return this.run(cwd, ['worktree', 'list', '--porcelain'])
-  }
-
-  status(cwd: string): Promise<GitResult> {
-    return this.run(cwd, ['status', '--short'])
-  }
-
-  async run(cwd: string, args: readonly string[]): Promise<GitResult> {
-    try {
-      const { stdout, stderr } = await this.exec(
-        this.gitExecutable,
-        ['-C', cwd, ...args],
-        { timeout: this.timeoutMs, encoding: 'utf8', maxBuffer: GIT_MAX_BUFFER },
-      )
-      return { stdout, stderr }
-    } catch (err) {
-      throw this.normalizeError(err, args[0] ?? 'command')
-    }
-  }
-
-  private normalizeError(err: unknown, operation: string): GitError {
-    if (err instanceof Error) {
-      const gitError = err as GitError
-      gitError.message = `Git ${operation} failed: ${gitError.message}`
-      return gitError
-    }
-    return new Error(`Git ${operation} failed: ${String(err)}`) as GitError
-  }
-}
-
-/**
- * Default production git adapter.
- * Tests should inject fake implementations or a fake exec.
- */
-export const defaultGitAdapter = new NodeGitAdapter()

package/src/notice-buffer.ts

@@ -1,23 +0,0 @@
-/**
- * D92 settlement-notice collapser (pure half of the followup-flood fix).
- *
- * Why: `sendUserMessage(followUp)` only delivers when the agent has no more
- * tool calls, so a long master run queues every settlement and floods at the
- * end. Buffer while busy; collapse at turn_end. The other half is the index
- * notice buffer.
- */
-export const NOTICE_MAX_SHOWN = 3;
-
-/**
- * Collapse a batch into one message body.
- * - empty → null (do not inject)
- * - ≤max → originals joined with `\n\n` (single-item byte-identical to the old format)
- * - >max → first max originals + a tail pointing at history / subagent list
- */
-export function collapseNotices(contents: readonly string[], max = NOTICE_MAX_SHOWN): string | null {
-  if (contents.length === 0) return null;
-  if (contents.length <= max) return contents.join('\n\n');
-  const hidden = contents.length - max;
-  const tail = `…另有 ${hidden} 条结算未逐条展示。全量结果看 history 台账（路径公式见 subagent resume 工具描述）；在跑代理用 subagent list 查看。`;
-  return [...contents.slice(0, max), tail].join('\n\n');
-}