@prestyj/cli 5.30.3 → 5.32.0

package/dist/modes/acp-autopilot.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Autopilot Nolan for `ezcoder acp`: the reviewer session the autopilot cycle
+ * prompts. Built like the desktop's `ensureNolanAutoSession` (app-sidecar.ts):
+ * Nolan's autopilot system prompt, Nolan's read-only tool set, a transient
+ * session, long cache retention, and the project's Nolan model pin when one is
+ * valid (otherwise Nolan follows EZ Coder's model, as on the desktop).
+ */
+import type { Provider } from "@prestyj/ai";
+/** The reviewer the ACP autopilot cycle talks to. A seam so tests can script Nolan. */
+export interface AcpNolanReviewer {
+    /** Wipe review history (start of each cycle). */
+    reset(): Promise<void>;
+    /** Prompt Nolan with a digest; resolves to his final reply text. */
+    review(digest: string): Promise<string>;
+    /** Stop an in-flight review (session/cancel, queued message). */
+    abort(): void;
+    dispose(): Promise<void>;
+}
+export interface AcpNolanReviewerOptions {
+    cwd: string;
+    /** EZ Coder's current model; Nolan follows it unless the project pins his own. */
+    buildModel: () => {
+        provider: Provider;
+        model: string;
+    };
+}
+export declare function createAcpNolanReviewer(options: AcpNolanReviewerOptions): AcpNolanReviewer;

package/dist/modes/acp-autopilot.js

@@ -0,0 +1,54 @@
+import { getModel } from "@prestyj/core";
+import { AgentSession } from "../core/agent-session.js";
+import { buildNolanAutopilotSystemPrompt } from "../core/nolan-prompt.js";
+import { validateNolanModelPref } from "../core/nolan-model.js";
+import { NOLAN_ALLOWED_TOOLS, lastAssistantText } from "../app-sidecar/nolan-context.js";
+import { loadNolanModelPref } from "../app-sidecar/app-settings.js";
+export function createAcpNolanReviewer(options) {
+    let abort = new AbortController();
+    let nolan = null;
+    async function ensure() {
+        if (nolan)
+            return nolan;
+        const pinned = validateNolanModelPref(await loadNolanModelPref(options.cwd), {
+            modelExists: (id) => getModel(id) !== undefined,
+            providerConnected: () => true,
+        });
+        const target = pinned ?? options.buildModel();
+        const created = new AgentSession({
+            provider: target.provider,
+            model: target.model,
+            cwd: options.cwd,
+            systemPrompt: await buildNolanAutopilotSystemPrompt(options.cwd),
+            allowedTools: NOLAN_ALLOWED_TOOLS,
+            transient: true,
+            signal: abort.signal,
+            forceLongCacheRetention: true,
+        });
+        await created.initialize();
+        nolan = created;
+        return created;
+    }
+    return {
+        async reset() {
+            await nolan?.newSession().catch(() => undefined);
+        },
+        async review(digest) {
+            const session = await ensure();
+            await session.prompt(digest);
+            return lastAssistantText(session.getMessages());
+        },
+        abort() {
+            abort.abort();
+            abort = new AbortController();
+            nolan?.setSignal(abort.signal);
+        },
+        async dispose() {
+            abort.abort();
+            const current = nolan;
+            nolan = null;
+            await current?.dispose();
+        },
+    };
+}
+//# sourceMappingURL=acp-autopilot.js.map

package/dist/modes/acp-autopilot.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"acp-autopilot.js","sourceRoot":"","sources":["../../src/modes/acp-autopilot.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,+BAA+B,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAmBpE,MAAM,UAAU,sBAAsB,CAAC,OAAgC;IACrE,IAAI,KAAK,GAAG,IAAI,eAAe,EAAE,CAAC;IAClC,IAAI,KAAK,GAAwB,IAAI,CAAC;IAEtC,KAAK,UAAU,MAAM;QACnB,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;QACxB,MAAM,MAAM,GAAG,sBAAsB,CAAC,MAAM,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3E,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,SAAS;YAC/C,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI;SAC9B,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QAC9C,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC;YAC/B,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,YAAY,EAAE,MAAM,+BAA+B,CAAC,OAAO,CAAC,GAAG,CAAC;YAChE,YAAY,EAAE,mBAAmB;YACjC,SAAS,EAAE,IAAI;YACf,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,uBAAuB,EAAE,IAAI;SAC9B,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QAC3B,KAAK,GAAG,OAAO,CAAC;QAChB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO;QACL,KAAK,CAAC,KAAK;YACT,MAAM,KAAK,EAAE,UAAU,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACnD,CAAC;QACD,KAAK,CAAC,MAAM,CAAC,MAAM;YACjB,MAAM,OAAO,GAAG,MAAM,MAAM,EAAE,CAAC;YAC/B,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC7B,OAAO,iBAAiB,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;QAClD,CAAC;QACD,KAAK;YACH,KAAK,CAAC,KAAK,EAAE,CAAC;YACd,KAAK,GAAG,IAAI,eAAe,EAAE,CAAC;YAC9B,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC;QACD,KAAK,CAAC,OAAO;YACX,KAAK,CAAC,KAAK,EAAE,CAAC;YACd,MAAM,OAAO,GAAG,KAAK,CAAC;YACtB,KAAK,GAAG,IAAI,CAAC;YACb,MAAM,OAAO,EAAE,OAAO,EAAE,CAAC;QAC3B,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/modes/acp-goals.d.ts

@@ -0,0 +1,52 @@
+import { type GoalRecord, type GoalResult } from "../core/goals-store.js";
+import type { SubAgentSnapshot } from "../core/subagent-manager.js";
+import type { AppAttachment } from "../app-sidecar/attachments.js";
+/** `_gg/goals/list` row: the sidecar's GoalSummary, addressed by session id. */
+export interface AcpGoalSummary {
+    id: string;
+    name: string;
+    goal: string;
+    context: GoalRecord["context"];
+    path: string;
+    createdAt: string;
+    lastActiveMs: number;
+    lastActiveDisplay: string;
+    /** The id `session/load` / `session/resume` take; null starts a fresh coordinator. */
+    agentSessionId: string | null;
+    /**
+     * Standing instructions, so a client's goal settings can show what is set
+     * (absent = none). The desktop app reads them from the record the same way.
+     */
+    instructions?: string;
+    /**
+     * `running` when some process holds the goal's run marker (this one, the
+     * desktop app, another `ezcoder acp`). A client that knows of a live run of
+     * its own may still overlay `running` on top.
+     */
+    status: "briefing" | "running" | "paused" | "interrupted" | "idle";
+}
+/** pew2 wire `GoalWorker`. */
+export interface AcpGoalWorker {
+    id: string;
+    name: string;
+    agent?: string;
+    state: "starting" | "running" | "completed" | "failed" | "interrupted" | "closed";
+    activity?: string;
+    startedAt?: number;
+    elapsedMs?: number;
+    toolUses?: number;
+    model?: string;
+    error?: string;
+}
+/** Every goal, most recently active first. */
+export declare function listAcpGoals(agentDir: string): Promise<AcpGoalSummary[]>;
+/** Create a goal from `_gg/goals/create` params; the store's own error text on failure. */
+export declare function createAcpGoal(agentDir: string, params: unknown): Promise<GoalResult<AcpGoalSummary>>;
+/** The worker roster for `_gg/goal_state`. A reaped worker reads as closed. */
+export declare function goalWorkers(snapshots: readonly SubAgentSnapshot[]): AcpGoalWorker[];
+/**
+ * ACP `image` prompt blocks as the app's attachment shape, so they take the
+ * same `prepareAttachments` → `promptWithAttachments` path the desktop does.
+ * Blocks carrying only a `uri` (no inline data) are skipped.
+ */
+export declare function acpImageAttachments(blocks: unknown): AppAttachment[];

package/dist/modes/acp-goals.js

@@ -0,0 +1,102 @@
+/**
+ * EZ Goals over ACP (`_gg/goals/*`, `_gg/goal/*`, `_gg/goal_state`): the pure
+ * pieces, kept out of `acp-mode.ts` so the transport stays readable. The goal
+ * list rows come from the same `summarizeGoal` the desktop sidecar uses.
+ */
+import path from "node:path";
+import { createGoal, goalsRoot, listGoals, } from "../core/goals-store.js";
+import { summarizeGoal } from "../core/goal-summary.js";
+import { SessionManager } from "../core/session-manager.js";
+function toAcpSummary(summary, instructions) {
+    return {
+        ...(instructions ? { instructions } : {}),
+        id: summary.id,
+        name: summary.name,
+        goal: summary.goal,
+        context: summary.context,
+        path: summary.path,
+        createdAt: summary.createdAt,
+        lastActiveMs: summary.lastActiveMs,
+        lastActiveDisplay: summary.lastActiveDisplay,
+        agentSessionId: summary.latestSessionId,
+        status: summary.status,
+    };
+}
+function sessionsDir(agentDir) {
+    return path.join(agentDir, "sessions");
+}
+/** Every goal, most recently active first. */
+export async function listAcpGoals(agentDir) {
+    const sessions = new SessionManager(sessionsDir(agentDir));
+    const goals = await listGoals(goalsRoot(agentDir));
+    const rows = await Promise.all(goals.map(async (g) => toAcpSummary(await summarizeGoal(sessions, g.dir, g.record), g.record.instructions)));
+    rows.sort((a, b) => b.lastActiveMs - a.lastActiveMs || a.id.localeCompare(b.id));
+    return rows;
+}
+/** Create a goal from `_gg/goals/create` params; the store's own error text on failure. */
+export async function createAcpGoal(agentDir, params) {
+    const input = params && typeof params === "object"
+        ? params
+        : {};
+    const created = await createGoal(goalsRoot(agentDir), {
+        name: typeof input.name === "string" ? input.name : "",
+        goal: typeof input.goal === "string" ? input.goal : "",
+        context: Array.isArray(input.context)
+            ? input.context.filter((p) => typeof p === "string")
+            : [],
+        ...(typeof input.instructions === "string" ? { instructions: input.instructions } : {}),
+    }, new Date());
+    if (!created.ok)
+        return created;
+    const sessions = new SessionManager(sessionsDir(agentDir));
+    return {
+        ok: true,
+        value: toAcpSummary(await summarizeGoal(sessions, created.value.dir, created.value.record), created.value.record.instructions),
+    };
+}
+/** The worker roster for `_gg/goal_state`. A reaped worker reads as closed. */
+export function goalWorkers(snapshots) {
+    return snapshots.map((s) => ({
+        id: s.agent_id,
+        name: s.task_name,
+        ...(s.agent_name ? { agent: s.agent_name } : {}),
+        state: s.state === "reaped" ? "closed" : s.state,
+        ...(s.current_activity ? { activity: s.current_activity } : {}),
+        startedAt: s.started_at,
+        elapsedMs: s.elapsed_ms,
+        toolUses: s.tool_use_count,
+        ...(s.model ? { model: s.model } : {}),
+        ...(s.error ? { error: s.error } : {}),
+    }));
+}
+const IMAGE_EXTENSIONS = {
+    "image/png": "png",
+    "image/jpeg": "jpg",
+    "image/gif": "gif",
+    "image/webp": "webp",
+};
+/**
+ * ACP `image` prompt blocks as the app's attachment shape, so they take the
+ * same `prepareAttachments` → `promptWithAttachments` path the desktop does.
+ * Blocks carrying only a `uri` (no inline data) are skipped.
+ */
+export function acpImageAttachments(blocks) {
+    if (!Array.isArray(blocks))
+        return [];
+    const out = [];
+    for (const block of blocks) {
+        const entry = block;
+        if (entry?.type !== "image" || typeof entry.data !== "string" || !entry.data)
+            continue;
+        const mediaType = typeof entry.mimeType === "string" ? entry.mimeType : "image/png";
+        const ext = IMAGE_EXTENSIONS[mediaType] ?? "img";
+        out.push({
+            kind: "image",
+            name: `image-${out.length + 1}.${ext}`,
+            mediaType,
+            data: entry.data,
+        });
+    }
+    return out;
+}
+//# sourceMappingURL=acp-goals.js.map

package/dist/modes/acp-goals.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"acp-goals.js","sourceRoot":"","sources":["../../src/modes/acp-goals.ts"],"names":[],"mappings":"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"}

package/dist/modes/acp-mode.d.ts

@@ -1,6 +1,12 @@
-import type { Message, Provider, ThinkingLevel } from "@prestyj/ai";
+import type { Message, MessageProvenance, Provider, ThinkingLevel } from "@prestyj/ai";
 import { type ToolExecuteResult } from "@prestyj/agent";
+import { AgentSession, type SessionAttachment } from "../core/agent-session.js";
+import type { ChildModelPick, SubAgentSnapshot } from "../core/subagent-manager.js";
+import { createAskUserTool } from "../tools/ask-user.js";
+import { type GoalBriefExtras, type GoalRecord } from "../core/goals-store.js";
 import type { EventBus } from "../core/event-bus.js";
+import type { AutopilotMarkerPayload } from "../core/session-manager.js";
+import { type AcpNolanReviewer } from "./acp-autopilot.js";
 /** The ACP major version this mode implements. Bumped only for breaking changes. */
 export declare const ACP_PROTOCOL_VERSION = 1;
 /**
@@ -13,7 +19,32 @@ export declare const ACP_PROTOCOL_VERSION = 1;
 export interface AcpAgentSession {
     readonly eventBus: Pick<EventBus, "on">;
     initialize(): Promise<void>;
-    prompt(content: string): Promise<void>;
+    /** `provenance` marks EZ Goals' hidden kickoff/resume instructions. */
+    prompt(content: string, provenance?: MessageProvenance): Promise<void>;
+    /** Image prompts (`promptCapabilities.image`); without it images are ignored. */
+    promptWithAttachments?(text: string, attachments: SessionAttachment[]): Promise<void>;
+    /**
+     * Mid-run steering (`_gg/queue`). Optional so a test double or alternative
+     * session need not support it; `_gg/queue` then answers -32602.
+     */
+    queueMessage?(text: string): number;
+    listQueuedMessages?(): Array<{
+        id: string;
+        text: string;
+    }>;
+    cancelQueuedMessage?(id: string): boolean;
+    drainQueue?(): string;
+    /** EZ Goals' workers, for `_gg/goal_state`. */
+    listSubAgents?(): SubAgentSnapshot[];
+    /** Adds a goal's attached folder to the workspace. */
+    addDirectory?(dir: string): Promise<{
+        ok: true;
+    } | {
+        ok: false;
+        error: string;
+    }>;
+    /** Tell the agent a fact at its next turn (goal settings changed). */
+    notify?(id: string, text: string): void;
     getState(): {
         sessionId: string;
         provider: Provider;
@@ -34,6 +65,16 @@ export interface AcpAgentSession {
     setSignal(signal: AbortSignal): void;
     /** Replay a session file from disk into this session. */
     loadSession(sessionPath: string): Promise<void>;
+    /**
+     * Nolan's verdict markers (desktop `persistAutopilotMarker`). Optional so a
+     * test double need not persist; without them a reopened session has no
+     * Nolan bubbles.
+     */
+    persistAutopilotMarker?(phase: AutopilotMarkerPayload["phase"], extra?: {
+        reason?: string;
+        body?: string;
+    }): Promise<void>;
+    getAutopilotMarkers?(): AutopilotMarkerPayload[];
     /** The conversation as restored, used to replay history to the client. */
     getMessages(): Message[];
     switchModel(provider: string, model: string): Promise<void>;
@@ -44,6 +85,12 @@ export interface AcpAgentSession {
     setPlanMode(active: boolean): Promise<void>;
     /** Bake an approved plan into the prompt so [DONE:n] progress markers work. */
     setApprovedPlan(planPath: string | undefined): Promise<void>;
+    /** Host verification evidence for Nolan's digest; optional for test doubles. */
+    getVerificationEvidence?(): AgentSession["getVerificationEvidence"] extends () => infer R ? R : never;
+    getVerificationProblem?(): string | null;
+    /** Fresh context for an accepted plan (desktop /plan/accept). Optional:
+     *  without it an accept keeps the current context and sends no reset. */
+    newSession?(preserveConversation?: boolean): Promise<void>;
     /**
      * Registry commands (/model, /compact, …), including any an extension
      * registered during `initialize`. Optional so a test double need not carry a
@@ -71,6 +118,52 @@ export interface AcpPlanHooks {
     /** Returns the instruction handed back to the model after approval. */
     onExitPlan: (planPath: string) => Promise<ToolExecuteResult>;
 }
+/**
+ * What a session is being built for, beyond the plan hooks.
+ *
+ * A third argument rather than a change to the first two so existing session
+ * factories (tests) keep working unchanged.
+ */
+export interface AcpSessionContext {
+    /** The session's working directory: the goal folder for a goal session. */
+    cwd: string;
+    /** Set when the cwd is a goal folder: build a EZ Goals coordinator. */
+    goal: {
+        dir: string;
+        record: GoalRecord;
+    } | null;
+    /** The goal's brief extras (memory, attached projects' rules), read once. */
+    goalExtras?: GoalBriefExtras;
+    /** Read live: true once the user has started the goal. */
+    isGoalActive: () => boolean;
+    /** Read live at each worker spawn. */
+    getChildModel: () => ChildModelPick | undefined;
+    /**
+     * The `ask_user` tool, present only when the client opted in with
+     * `clientCapabilities._meta.gg.askUser`. Goes in `additionalTools` at
+     * construction (the tool array is append-only for the prompt cache).
+     */
+    askUserTool?: ReturnType<typeof createAskUserTool>;
+    /**
+     * The client reviews plans itself (`clientCapabilities._meta.gg.planReview`):
+     * exit_plan parks the plan for a human decision instead of auto-approving,
+     * and the session gets the desktop's `planSubmissionGate`.
+     */
+    planReview?: boolean;
+}
+/**
+ * A plan submitted via exit_plan that awaits a decision (desktop parity:
+ * app-sidecar.ts pendingPlanPath/planGeneration/offeredPlanGeneration). One
+ * object so the autopilot cycle can read and settle it.
+ */
+export interface AcpPendingPlanState {
+    planPath: string | null;
+    content: string;
+    /** Bumped on every set/clear; a stale decision is refused. */
+    generation: number;
+    /** Generation last offered to the client; -1 when none. */
+    offeredGeneration: number;
+}
 export interface AcpModeOptions {
     provider: Provider;
     model: string;
@@ -86,7 +179,22 @@ export interface AcpModeOptions {
      * Builds the session for `session/new`. Overridden by tests; production
      * always gets a real {@link AgentSession}.
      */
-    createSession?: (signal: AbortSignal, hooks: AcpPlanHooks) => AcpAgentSession;
+    createSession?: (signal: AbortSignal, hooks: AcpPlanHooks, context: AcpSessionContext) => AcpAgentSession;
+    /** `~/.ezcoder` by default; where goals (`goals/`) and sessions live. */
+    agentDir?: string;
+    /**
+     * `ask_user` soft deadline (default: the desktop's interactive 10 min). Past
+     * it the model hears "no answer yet" and the client's question stays open.
+     */
+    askUserDeadlineMs?: number;
+    /**
+     * Builds Autopilot Nolan's reviewer for a session's project. Overridden by
+     * tests; production gets {@link createAcpNolanReviewer}.
+     */
+    createNolanReviewer?: (cwd: string, buildModel: () => {
+        provider: Provider;
+        model: string;
+    }) => AcpNolanReviewer;
 }
 /** The selectors this agent exposes. Ids are part of the wire contract. */
 export declare const MODEL_CONFIG_ID = "model";
@@ -107,6 +215,23 @@ export declare const MODE_CONFIG_ID = "mode";
  * the protocol needs of them.
  */
 export declare function historyUpdates(messages: readonly Message[]): Record<string, unknown>[];
+/** A replayed Nolan marker, as `_gg/autopilot_event` params (sans sessionId). */
+export interface HistoryAutopilotEvent {
+    phase: string;
+    reason?: string;
+    body?: string;
+    history: true;
+}
+/**
+ * {@link historyUpdates} with Nolan's verdict markers interleaved at their
+ * `afterMessageCount` (non-system messages, as the desktop history route
+ * counts them). Marker phase `plan_approved` replays as ACP `plan_accepted`.
+ */
+export declare function historyFrames(messages: readonly Message[], markers: readonly AutopilotMarkerPayload[]): Array<{
+    update: Record<string, unknown>;
+} | {
+    autopilot: HistoryAutopilotEvent;
+}>;
 /**
  * Serve ACP on stdio until the input stream ends.
  *