@pi-unipi/unipi 2.6.0 → 2.6.2

package/packages/ralph/ralph-loop.ts

@@ -57,23 +57,6 @@ Pause and reflect on your progress:
 
 Update the task file with your reflection, then continue working.`;
 
-/** Default task template */
-export const DEFAULT_TEMPLATE = `# Task
-
-Describe your task here.
-
-## Goals
-- Goal 1
-- Goal 2
-
-## Checklist
-- [ ] Item 1
-- [ ] Item 2
-
-## Notes
-(Update this as you work)
-`;
-
 /** Ralph loop manager */
 export class RalphLoopManager {
   private currentLoop: string | null = null;
@@ -144,7 +127,7 @@ export class RalphLoopManager {
     if (message && this.ctx.hasUI) this.ctx.ui.notify(message, "info");
   }
 
-  completeLoop(state: LoopState, banner: string): void {
+  completeLoop(state: LoopState, reason: "completed" | "cancelled" = "completed", message?: string): void {
     state.status = "completed";
     state.completedAt = now();
     state.active = false;
@@ -156,26 +139,7 @@ export class RalphLoopManager {
       iteration: state.iteration,
       maxIterations: state.maxIterations,
       status: "completed",
-      reason: "completed",
-    } satisfies UnipiRalphLoopEvent);
-
-    this.currentLoop = null;
-    this.updateUI();
-  }
-
-  stopLoop(state: LoopState, message?: string): void {
-    state.status = "completed";
-    state.completedAt = now();
-    state.active = false;
-    this.saveState(state);
-
-    // Emit event
-    this.emitFn(UNIPI_EVENTS.RALPH_LOOP_END, {
-      name: state.name,
-      iteration: state.iteration,
-      maxIterations: state.maxIterations,
-      status: "completed",
-      reason: "cancelled",
+      reason,
     } satisfies UnipiRalphLoopEvent);
 
     this.currentLoop = null;
@@ -365,12 +329,7 @@ export class RalphLoopManager {
 
     // Check max iterations
     if (state.maxIterations > 0 && state.iteration > state.maxIterations) {
-      this.completeLoop(
-        state,
-        `───────────────────────────────────────────────────────────────────────
-⚠️ RALPH LOOP STOPPED: ${state.name} | Max iterations (${state.maxIterations}) reached
-───────────────────────────────────────────────────────────────────────`,
-      );
+      this.completeLoop(state);
       return null;
     }
 

package/packages/subagents/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/subagents",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "Subagents for UniPi — parallel execution, file locking, workflow integration",
   "type": "module",
   "main": "dist/index.js",
@@ -18,6 +18,7 @@
     "test": "npx tsx --test src/__tests__/*.test.ts"
   },
   "dependencies": {
+    "@pi-unipi/core": "2.6.1",
     "@earendil-works/pi-agent-core": "^0.80.0"
   },
   "devDependencies": {

package/packages/subagents/src/agent-manager.ts

@@ -17,7 +17,6 @@ import { loadCustomAgents } from "./custom-agents.js";
 function compareCodeUnits(a: string, b: string): number {
   return a < b ? -1 : a > b ? 1 : 0;
 }
-import { FileLock } from "./file-lock.js";
 
 export type OnAgentComplete = (record: AgentRecord) => void;
 export type OnAgentStart = (record: AgentRecord) => void;
@@ -41,7 +40,6 @@ interface SpawnOptions {
   thinkingLevel?: ThinkingLevel;
   maxTurns?: number;
   isolated?: boolean;
-  inheritContext?: boolean;
   isBackground?: boolean;
   onToolActivity?: (activity: ToolActivity) => void;
   onTextDelta?: (delta: string, fullText: string) => void;
@@ -58,9 +56,6 @@ export class AgentManager {
   private customAgents: Map<string, AgentConfig>;
   private typeSettings: SubagentsConfig["types"];
 
-  /** Per-file transparent locking for write agents. */
-  readonly fileLock = new FileLock();
-
   /** Queue of background agents waiting to start. */
   private queue: { id: string; args: SpawnArgs }[] = [];
   /** Number of currently running background agents. */
@@ -107,11 +102,6 @@ export class AgentManager {
     }
   }
 
-  setMaxConcurrent(n: number) {
-    this.maxConcurrent = Math.max(1, n);
-    this.drainQueue();
-  }
-
   getMaxConcurrent(): number {
     return this.maxConcurrent;
   }
@@ -140,7 +130,6 @@ export class AgentManager {
       toolUses: 0,
       startedAt: Date.now(),
       abortController,
-      lockedFiles: new Set(),
     };
     this.agents.set(id, record);
 
@@ -189,7 +178,6 @@ export class AgentManager {
       agentConfig,
       maxTurns: options.maxTurns ?? agentConfig?.maxTurns,
       isolated: options.isolated ?? agentConfig?.isolated,
-      inheritContext: options.inheritContext ?? agentConfig?.inheritContext,
       thinkingLevel: options.thinkingLevel ?? agentConfig?.thinking,
       signal: record.abortController!.signal,
       onToolActivity: (activity) => {
@@ -211,10 +199,6 @@ export class AgentManager {
         record.session = session;
         record.completedAt ??= Date.now();
 
-        // Release any held file locks
-        this.fileLock.releaseAll(id);
-        record.lockedFiles.clear();
-
         if (options.isBackground) {
           this.runningBackground--;
           this.onComplete?.(record);
@@ -229,10 +213,6 @@ export class AgentManager {
         record.error = err instanceof Error ? err.message : String(err);
         record.completedAt ??= Date.now();
 
-        // Release any held file locks
-        this.fileLock.releaseAll(id);
-        record.lockedFiles.clear();
-
         if (options.isBackground) {
           this.runningBackground--;
           this.onComplete?.(record);
@@ -293,8 +273,6 @@ export class AgentManager {
     record.abortController?.abort();
     record.status = "stopped";
     record.completedAt = Date.now();
-    this.fileLock.releaseAll(id);
-    record.lockedFiles.clear();
     return true;
   }
 
@@ -318,38 +296,9 @@ export class AgentManager {
         count++;
       }
     }
-    this.fileLock.clear();
     return count;
   }
 
-  /** Wait for all agents. */
-  async waitForAll(): Promise<void> {
-    while (true) {
-      this.drainQueue();
-      const pending = [...this.agents.values()]
-        .filter((r) => r.status === "running" || r.status === "queued")
-        .map((r) => r.promise)
-        .filter(Boolean);
-      if (pending.length === 0) break;
-      await Promise.allSettled(pending);
-    }
-  }
-
-  /** Whether any agents running or queued. */
-  hasRunning(): boolean {
-    return [...this.agents.values()].some((r) => r.status === "running" || r.status === "queued");
-  }
-
-  /** Remove completed records. */
-  clearCompleted(): void {
-    for (const [id, record] of this.agents) {
-      if (record.status === "running" || record.status === "queued") continue;
-      record.session?.dispose?.();
-      record.session = undefined;
-      this.agents.delete(id);
-    }
-  }
-
   private cleanup() {
     const cutoff = Date.now() - 10 * 60_000;
     for (const [id, record] of this.agents) {

package/packages/subagents/src/agent-runner.ts

@@ -25,27 +25,8 @@ const EXCLUDED_TOOL_NAMES = ["spawn_helper", "get_helper_result", "Agent", "get_
 /** All known built-in tool names. */
 const BUILTIN_TOOL_NAMES = ["read", "bash", "edit", "write", "grep", "find", "ls"];
 
-/** Default max turns. undefined = unlimited. */
-let defaultMaxTurns: number | undefined;
-
-export function getDefaultMaxTurns(): number | undefined {
-  return defaultMaxTurns;
-}
-
-export function setDefaultMaxTurns(n: number | undefined): void {
-  defaultMaxTurns = n == null || n === 0 ? undefined : Math.max(1, n);
-}
-
-/** Grace turns after soft limit. */
-let graceTurns = 5;
-
-export function getGraceTurns(): number {
-  return graceTurns;
-}
-
-export function setGraceTurns(n: number): void {
-  graceTurns = Math.max(1, n);
-}
+/** Grace turns after the soft turn limit before aborting. */
+const GRACE_TURNS = 5;
 
 /** Tool activity info. */
 export interface ToolActivity {
@@ -61,7 +42,6 @@ export interface RunOptions {
   maxTurns?: number;
   signal?: AbortSignal;
   isolated?: boolean;
-  inheritContext?: boolean;
   thinkingLevel?: ThinkingLevel;
   cwd?: string;
   onToolActivity?: (activity: ToolActivity) => void;
@@ -123,8 +103,7 @@ function getToolNamesForType(type: AgentType, config?: AgentConfig): string[] {
   return [...BUILTIN_TOOL_NAMES];
 }
 
-/**
- * Resolve agent config for a type.
+/** Resolve agent config for a type.
  * Priority: explicit config > builtin config > default
  */
 function resolveAgentConfig(type: AgentType, explicitConfig?: AgentConfig): AgentConfig | undefined {
@@ -132,15 +111,6 @@ function resolveAgentConfig(type: AgentType, explicitConfig?: AgentConfig): Agen
   return BUILTIN_CONFIGS[type];
 }
 
-/** Resolve model from config. */
-function resolveDefaultModel(
-  parentModel: Model<any> | undefined,
-  configModel?: string,
-): Model<any> | undefined {
-  // For now, just use parent model. Full model resolution requires registry.
-  return parentModel;
-}
-
 /**
  * Run an agent session.
  */
@@ -191,7 +161,7 @@ export async function runAgent(
   await loader.reload();
 
   // Resolve model
-  const model = options.model ?? resolveDefaultModel(ctx.model);
+  const model = options.model ?? ctx.model;
 
   // Create session
   const sessionOpts: Parameters<typeof createAgentSession>[0] = {
@@ -235,7 +205,7 @@ export async function runAgent(
 
   // Track turns
   let turnCount = 0;
-  const maxTurns = options.maxTurns ?? defaultMaxTurns;
+  const maxTurns = options.maxTurns;
   let softLimitReached = false;
   let aborted = false;
 
@@ -248,7 +218,7 @@ export async function runAgent(
         if (!softLimitReached && turnCount >= maxTurns) {
           softLimitReached = true;
           session.steer("You have reached your turn limit. Wrap up immediately — provide your final answer now.");
-        } else if (softLimitReached && turnCount >= maxTurns + graceTurns) {
+        } else if (softLimitReached && turnCount >= maxTurns + GRACE_TURNS) {
           aborted = true;
           session.abort();
         }
@@ -283,47 +253,3 @@ export async function runAgent(
   const responseText = collector.getText().trim() || getLastAssistantText(session);
   return { responseText, session, aborted, steered: softLimitReached };
 }
-
-/**
- * Get conversation text from a session.
- */
-export function getAgentConversation(session: AgentSession): string {
-  const parts: string[] = [];
-
-  for (const msg of session.messages) {
-    if (msg.role === "user") {
-      const content = msg.content;
-      const text = typeof content === "string"
-        ? content
-        : content
-            .filter((c): c is { type: "text"; text: string } => c.type === "text")
-            .map((c) => c.text)
-            .join("");
-      if (text.trim()) parts.push(`[User]: ${text.trim()}`);
-    } else if (msg.role === "assistant") {
-      const textParts: string[] = [];
-      const toolCalls: string[] = [];
-      const content = msg.content;
-      if (typeof content !== "string") {
-        for (const c of content) {
-          if (c.type === "text" && c.text) textParts.push(c.text);
-          else if (c.type === "toolCall") toolCalls.push(`  Tool: ${(c as any).name ?? "unknown"}`);
-        }
-      }
-      if (textParts.length > 0) parts.push(`[Assistant]: ${textParts.join("\n")}`);
-      if (toolCalls.length > 0) parts.push(`[Tool Calls]:\n${toolCalls.join("\n")}`);
-    } else if (msg.role === "toolResult") {
-      const content = msg.content;
-      const text = typeof content === "string"
-        ? content
-        : content
-            .filter((c): c is { type: "text"; text: string } => c.type === "text")
-            .map((c) => c.text)
-            .join("");
-      const truncated = text.length > 200 ? text.slice(0, 200) + "..." : text;
-      parts.push(`[Tool Result (${msg.toolName})]: ${truncated}`);
-    }
-  }
-
-  return parts.join("\n\n");
-}

package/packages/subagents/src/conversation-viewer.ts

@@ -7,6 +7,7 @@
  */
 
 import type { AgentSession } from "@earendil-works/pi-coding-agent";
+import { formatMs, describeActivity } from "./widget.js";
 import {
   type Component,
   matchesKey,
@@ -30,13 +31,6 @@ function extractText(content: string | Array<{ type: string; text?: string }>):
     .join("");
 }
 
-/** Format duration. */
-function formatMs(ms: number): string {
-  if (ms >= 60_000) return `${(ms / 60_000).toFixed(1)}m`;
-  if (ms >= 1_000) return `${(ms / 1_000).toFixed(1)}s`;
-  return `${ms}ms`;
-}
-
 /** Format tokens compactly. */
 function formatTokens(count: number): string {
   if (count >= 1_000_000) return `${(count / 1_000_000).toFixed(1)}M token`;
@@ -45,18 +39,6 @@ function formatTokens(count: number): string {
 }
 
 /** Describe current activity from active tools. */
-function describeActivity(activeTools: Map<string, string>, responseText?: string): string {
-  if (activeTools.size > 0) {
-    const names = [...new Set(activeTools.values())];
-    return names.join(", ") + "…";
-  }
-  if (responseText && responseText.trim().length > 0) {
-    const lastLine = responseText.split("\n").find((l) => l.trim())?.trim() ?? "";
-    if (lastLine.length > 60) return lastLine.slice(0, 60) + "…";
-    if (lastLine.length > 0) return lastLine;
-  }
-  return "thinking…";
-}
 
 interface ViewerRecord {
   type: string;

package/packages/subagents/src/core-compat.ts

@@ -1,33 +1,17 @@
+/**
+ * @pi-unipi/subagents — Local helpers (not in @pi-unipi/core)
+ *
+ * boundHelperOutput: bounded output with artifact-to-disk fallback.
+ * withHerdrBlocked: wraps a fn with herdr:blocked events.
+ */
+
+import { emitEvent } from "@pi-unipi/core";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { chmodSync, lstatSync, mkdirSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { randomUUID } from "node:crypto";
 
-export const MODULES = { SUBAGENTS: "subagents" } as const;
-
-export const UNIPI_EVENTS = {
-  MODULE_READY: "unipi:module:ready",
-  BADGE_GENERATE_REQUEST: "unipi:badge:generate:request",
-} as const;
-
-export interface UnipiBadgeGenerateRequestEvent {
-  conversationSummary?: string;
-}
-
-export function emitEvent(
-  pi: Pick<ExtensionAPI, "events">,
-  eventName: string,
-  payload: unknown,
-): boolean {
-  try {
-    pi.events.emit(eventName, payload);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
 export interface BoundedHelperOutput {
   text: string;
   truncated: boolean;
@@ -35,7 +19,6 @@ export interface BoundedHelperOutput {
   artifactPath?: string;
 }
 
-/** Standalone-package twin of core's bounded-output policy. */
 const MAX_RAW_HELPER_ARTIFACT_BYTES = 16 * 1024 * 1024;
 
 export function boundHelperOutput(

package/packages/subagents/src/custom-agents.ts

@@ -74,7 +74,6 @@ function loadAgentFromFile(filePath: string, source: "project" | "global"): Agen
       maxTurns: (frontmatter as any).max_turns as number | undefined,
       systemPrompt: body.trim(),
       promptMode: ((frontmatter as any).prompt_mode as "replace" | "append") ?? "replace",
-      inheritContext: (frontmatter as any).inherit_context as boolean | undefined,
       runInBackground: (frontmatter as any).run_in_background as boolean | undefined,
       isolated: (frontmatter as any).isolated as boolean | undefined,
       enabled: (frontmatter as any).enabled !== false,

package/packages/subagents/src/index.ts

@@ -12,12 +12,13 @@ import { Type } from "typebox";
 import { existsSync, readdirSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
-import { boundHelperOutput, emitEvent, MODULES, UNIPI_EVENTS, withHerdrBlocked, type UnipiBadgeGenerateRequestEvent } from "./core-compat.js";
+import { MODULES, UNIPI_EVENTS, emitEvent, type UnipiBadgeGenerateRequestEvent } from "@pi-unipi/core";
+import { boundHelperOutput, withHerdrBlocked } from "./core-compat.js";
 import { AgentManager } from "./agent-manager.js";
 import { initConfig } from "./config.js";
 import { type AgentActivity, type NotificationDetails, BUILTIN_TYPES } from "./types.js";
 import { ConversationViewer } from "./conversation-viewer.js";
-import { AgentWidget } from "./widget.js";
+import { AgentWidget, SPINNER, TOOL_DISPLAY, formatMs, formatTurns, describeActivity } from "./widget.js";
 
 /** Get info registry from global */
 function getInfoRegistry() {
@@ -26,18 +27,8 @@ function getInfoRegistry() {
 
 // ---- Formatting helpers (shared between renderers and inline text) ----
 
-const SPINNER = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
 
 /** Tool name → human-readable action. */
-const TOOL_DISPLAY: Record<string, string> = {
-  read: "reading",
-  bash: "running command",
-  edit: "editing",
-  write: "writing",
-  grep: "searching",
-  find: "finding files",
-  ls: "listing",
-};
 
 function formatTokens(count: number): string {
   if (count >= 1_000_000) return `${(count / 1_000_000).toFixed(1)}M token`;
@@ -45,42 +36,6 @@ function formatTokens(count: number): string {
   return `${count} token`;
 }
 
-function formatTurns(turn: number, max?: number | null): string {
-  return max != null ? `⟳${turn}≤${max}` : `⟳${turn}`;
-}
-
-function formatMs(ms: number): string {
-  if (ms >= 60_000) return `${(ms / 60_000).toFixed(1)}m`;
-  if (ms >= 1_000) return `${(ms / 1_000).toFixed(1)}s`;
-  return `${ms}ms`;
-}
-
-/** Build activity description from active tools. */
-function describeActivity(activeTools: Map<string, string>, responseText?: string): string {
-  if (activeTools.size > 0) {
-    const groups = new Map<string, number>();
-    for (const toolName of activeTools.values()) {
-      const action = TOOL_DISPLAY[toolName] ?? toolName;
-      groups.set(action, (groups.get(action) ?? 0) + 1);
-    }
-    const parts: string[] = [];
-    for (const [action, count] of groups) {
-      if (count > 1) {
-        parts.push(`${action} ${count} ${action === "searching" ? "patterns" : "files"}`);
-      } else {
-        parts.push(action);
-      }
-    }
-    return parts.join(", ") + "…";
-  }
-  if (responseText && responseText.trim().length > 0) {
-    const line = responseText.split("\n").find((l) => l.trim())?.trim() ?? "";
-    if (line.length > 60) return line.slice(0, 60) + "…";
-    if (line.length > 0) return line;
-  }
-  return "thinking…";
-}
-
 /** Format tokens safely from session. */
 function safeFormatTokens(session: any): string {
   if (!session) return "";

package/packages/subagents/src/types.ts

@@ -74,7 +74,6 @@ export interface AgentConfig {
   maxTurns?: number;
   systemPrompt: string;
   promptMode: "replace" | "append";
-  inheritContext?: boolean;
   runInBackground?: boolean;
   isolated?: boolean;
   memory?: MemoryScope;
@@ -101,16 +100,6 @@ export interface AgentRecord {
   promise?: Promise<string>;
   /** Set when result consumed via get_result — suppresses notification. */
   resultConsumed?: boolean;
-  /** Files locked by this agent. */
-  lockedFiles: Set<string>;
-}
-
-/** File lock entry. */
-export interface FileLockEntry {
-  agentId: string;
-  filePath: string;
-  promise: Promise<void>;
-  release: () => void;
 }
 
 /** Extension config. */

package/packages/subagents/src/widget.ts

@@ -21,13 +21,13 @@ import type { AgentActivity } from "./types.js";
 const MAX_WIDGET_LINES = 12;
 
 /** Braille spinner frames. */
-const SPINNER = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+export const SPINNER = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
 
 /** Statuses that indicate error/non-success (for linger behavior). */
 const ERROR_STATUSES = new Set(["error", "aborted", "stopped"]);
 
 /** Tool name → human-readable action for activity descriptions. */
-const TOOL_DISPLAY: Record<string, string> = {
+export const TOOL_DISPLAY: Record<string, string> = {
   read: "reading",
   bash: "running command",
   edit: "editing",
@@ -40,14 +40,14 @@ const TOOL_DISPLAY: Record<string, string> = {
 // ---- Formatting helpers ----
 
 /** Format duration. */
-function formatMs(ms: number): string {
+export function formatMs(ms: number): string {
   if (ms >= 60_000) return `${(ms / 60_000).toFixed(1)}m`;
   if (ms >= 1_000) return `${(ms / 1_000).toFixed(1)}s`;
   return `${ms}ms`;
 }
 
 /** Format turns with optional max limit: "⟳5≤30" or "⟳5". */
-function formatTurns(turn: number, max?: number): string {
+export function formatTurns(turn: number, max?: number): string {
   return max != null ? `⟳${turn}≤${max}` : `⟳${turn}`;
 }
 
@@ -55,7 +55,7 @@ function formatTurns(turn: number, max?: number): string {
  * Build a human-readable activity string from currently-running tools.
  * Groups by tool type with counts: "reading 3 files, searching 2 patterns".
  */
-function describeActivity(activeTools: Map<string, string>, responseText?: string): string {
+export function describeActivity(activeTools: Map<string, string>, responseText?: string): string {
   if (activeTools.size > 0) {
     const groups = new Map<string, number>();
     for (const toolName of activeTools.values()) {