@mrclrchtr/supi-prompt-improver 11.1.0 → 11.3.0

package/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Changelog
+
+## [11.3.0]
+
+- Added package-specific release notes for prompt improvement and its bundled decision forms.

package/node_modules/@mrclrchtr/supi-ask-user/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Changelog
+
+## [11.3.0]
+
+- Added package-specific release notes for structured questions and reusable decision forms.

package/node_modules/@mrclrchtr/supi-ask-user/node_modules/@mrclrchtr/supi-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "11.1.0",
+  "version": "11.3.0",
   "description": "Shared settings, configuration, reporting, and session infrastructure",
   "license": "MIT",
   "repository": {

package/node_modules/@mrclrchtr/supi-ask-user/node_modules/@mrclrchtr/supi-core/src/child-web-tools.ts

@@ -0,0 +1,110 @@
+// Session-provided Web tools for SuPi child sessions (Agent Runs and Reviewer Sessions).
+//
+// The loaded supi-web extension answers a synchronous request on the parent event bus.
+// Consumers never depend on supi-web; when it is absent or provides no tools, the
+// request returns undefined and the child simply lacks Web tools.
+
+import type { ExtensionAPI, ExtensionFactory } from "@earendil-works/pi-coding-agent";
+
+/** Web tools that child sessions may receive when the containing session provides them. */
+export const CHILD_WEB_TOOL_NAMES = [
+  "web_fetch_md",
+  "web_search",
+  "web_docs_search",
+  "web_docs_fetch",
+] as const;
+
+/** One session-provided Web tool name. */
+export type ChildWebToolName = (typeof CHILD_WEB_TOOL_NAMES)[number];
+
+/**
+ * Web tools currently callable in the containing session plus a child-only extension
+ * factory that registers them. The factory must not capture the parent session; it may
+ * capture plain data such as the containing session's configuration directory.
+ */
+export interface ChildWebToolProvision {
+  readonly toolNames: readonly ChildWebToolName[];
+  /** Register the requested subset of `toolNames` in a child session. */
+  readonly createFactory: (toolNames: readonly ChildWebToolName[]) => ExtensionFactory;
+}
+
+/** Plain containing-session data supplied with a child Web tool request. */
+export interface ChildWebToolsRequestContext {
+  /**
+   * Working directory whose SuPi configuration governs Web settings such as Firecrawl.
+   * Children with a different cwd (for example a frozen Review Workspace) keep this policy.
+   */
+  readonly configCwd: string;
+}
+
+type EventBusLike = Pick<ExtensionAPI["events"], "on" | "emit">;
+
+const REQUEST_CHANNEL = "supi:child-web-tools:request";
+const RESPONSE_CHANNEL = "supi:child-web-tools:response";
+
+interface ChildWebToolsRequest extends ChildWebToolsRequestContext {
+  readonly requestId: string;
+}
+
+interface ChildWebToolsResponse {
+  readonly requestId: string;
+  readonly provision: ChildWebToolProvision;
+}
+
+let nextRequestId = 0;
+
+/**
+ * Answer child Web tool requests on the parent event bus. The callback must be synchronous
+ * because Pi's event bus does not await listeners. Returns an unsubscribe function.
+ */
+export function provideChildWebTools(
+  events: EventBusLike,
+  resolve: (context: ChildWebToolsRequestContext) => ChildWebToolProvision | undefined,
+): () => void {
+  return events.on(REQUEST_CHANNEL, (data) => {
+    const request = data as Partial<ChildWebToolsRequest> | undefined;
+    if (typeof request?.requestId !== "string" || typeof request.configCwd !== "string") return;
+    const { requestId, configCwd } = request;
+    const provision = resolve({ configCwd });
+    if (!provision || provision.toolNames.length === 0) return;
+    events.emit(RESPONSE_CHANNEL, { requestId, provision } satisfies ChildWebToolsResponse);
+  });
+}
+
+/** Capture the Web tools the containing session currently provides, if any. */
+export function requestChildWebTools(
+  events: EventBusLike,
+  context: ChildWebToolsRequestContext,
+): ChildWebToolProvision | undefined {
+  const requestId = `child-web-${process.pid}-${++nextRequestId}`;
+  let provision: ChildWebToolProvision | undefined;
+  const unsubscribe = events.on(RESPONSE_CHANNEL, (data) => {
+    const response = data as Partial<ChildWebToolsResponse> | undefined;
+    if (response?.requestId === requestId && response.provision) provision = response.provision;
+  });
+  try {
+    events.emit(REQUEST_CHANNEL, { requestId, ...context } satisfies ChildWebToolsRequest);
+  } finally {
+    unsubscribe();
+  }
+  return provision;
+}
+
+/**
+ * Return the Web tools callable in a session under Pi's exposure rules: active `direct`
+ * tools, plus registered `codemode` and `deferred` tools. `model-only` and `hidden`
+ * tools are not callable.
+ */
+export function callableChildWebToolNames(
+  pi: Pick<ExtensionAPI, "getAllTools" | "getActiveTools">,
+): ChildWebToolName[] {
+  const active = new Set(pi.getActiveTools());
+  const exposures = new Map(
+    pi.getAllTools().map((tool) => [tool.name, tool.exposure ?? "direct"] as const),
+  );
+  return CHILD_WEB_TOOL_NAMES.filter((name) => {
+    const exposure = exposures.get(name);
+    if (exposure === "direct") return active.has(name);
+    return exposure === "codemode" || exposure === "deferred";
+  });
+}

package/node_modules/@mrclrchtr/supi-ask-user/node_modules/@mrclrchtr/supi-core/src/session.ts

@@ -1,5 +1,16 @@
 // supi-core session domain — session utilities and registries.
 
+export type {
+  ChildWebToolName,
+  ChildWebToolProvision,
+  ChildWebToolsRequestContext,
+} from "./child-web-tools.ts";
+export {
+  CHILD_WEB_TOOL_NAMES,
+  callableChildWebToolNames,
+  provideChildWebTools,
+  requestChildWebTools,
+} from "./child-web-tools.ts";
 export { createRegistry, createSessionStateRegistry } from "./registry-utils.ts";
 export type {
   SessionCapabilitySkill,

package/node_modules/@mrclrchtr/supi-ask-user/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-ask-user",
-  "version": "11.1.0",
+  "version": "11.3.0",
   "description": "Structured choice and text forms for agent-user decisions",
   "license": "MIT",
   "repository": {
@@ -28,11 +28,12 @@
   ],
   "type": "module",
   "files": [
+    "CHANGELOG.md",
     "src/**/*.ts",
     "!__tests__"
   ],
   "dependencies": {
-    "@mrclrchtr/supi-core": "11.1.0"
+    "@mrclrchtr/supi-core": "11.3.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-core"

package/node_modules/@mrclrchtr/supi-ask-user/src/form-api.ts

@@ -52,6 +52,7 @@ export interface OpenAskUserFormOptions {
  *
  * This API does not persist results, label transcript entries, or abort a Pi
  * agent turn. It uses Pi's editor area by default and one shared lock for all callers.
+ * Inline forms report that Pi is waiting for an answer; overlays leave program status unchanged.
  */
 export async function openAskUserForm(
   questionnaire: NormalizedQuestionnaire,
@@ -84,7 +85,9 @@ export async function openAskUserForm(
               options.onAcquire?.();
               return factory(tui, theme, keybindings, done);
             },
-            options.overlay ? { overlay: true } : undefined,
+            options.overlay
+              ? { overlay: true }
+              : { blocked: { kind: "question", message: "Waiting for your answer" } },
           ),
       },
       signal: options.signal,

package/node_modules/@mrclrchtr/supi-ask-user/src/tool/ask_user/guidance.ts

@@ -1,7 +1,7 @@
 // Prompt guidance and tool description for the redesigned ask_user tool.
 
 export const toolDescription =
-  "Open a blocking interactive TUI form only when a focused user decision blocks progress after available inspection. Not for status updates or broad surveys. Supports 1-10 choice/text questions, one active form, and sequential execution; requires TUI custom UI.";
+  "Open a blocking interactive TUI form only when a focused user decision blocks progress after available inspection. Not for status updates or broad surveys. Supports 1-10 choice/text questions, one active form, and sequential execution; requires TUI custom UI. ask_user is unavailable inside codemode; call it only directly.";
 
 export const promptSnippet = "request a focused blocking user decision";
 

package/node_modules/@mrclrchtr/supi-ask-user/src/tool/ask_user/render.ts

@@ -1,4 +1,4 @@
-import { type AgentToolResult, keyText, type Theme } from "@earendil-works/pi-coding-agent";
+import type { AgentToolResult, KeybindingHints, Theme } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import type { AskUserParams } from "../../schema.ts";
 import type {
@@ -12,7 +12,6 @@ import { isErrorDetails } from "../../types.ts";
 import { ASK_USER_TOOL_NAME } from "./spec.ts";
 
 const COLLAPSED_ANSWER_LIMIT = 2;
-const DEFAULT_REVIEW_KEY = "Ctrl+O";
 
 type AskUserRenderOptions = {
   expanded?: boolean;
@@ -21,6 +20,7 @@ type AskUserRenderOptions = {
 
 type AskUserRenderContext = {
   isError?: boolean;
+  keyText?: KeybindingHints["keyText"];
 };
 
 export function renderAskUserCall(args: AskUserParams, theme: Theme): Text {
@@ -56,7 +56,7 @@ export function renderAskUserResult(
 
   const lines = options.expanded
     ? buildExpandedResultLines(result.details, theme)
-    : buildCollapsedResultLines(result.details, theme);
+    : buildCollapsedResultLines(result.details, theme, context.keyText?.("app.tools.expand") ?? "");
   return new Text(lines.join("\n"), 0, 0);
 }
 
@@ -83,11 +83,15 @@ function firstTextContent(
   return result.content.find((block) => block.type === "text")?.text;
 }
 
-function buildCollapsedResultLines(details: AskUserDetails, theme: Theme): string[] {
+function buildCollapsedResultLines(
+  details: AskUserDetails,
+  theme: Theme,
+  reviewKey: string,
+): string[] {
   const answerLines = buildAnswerLines(details, theme);
   const shownAnswerLines = answerLines.slice(0, COLLAPSED_ANSWER_LIMIT);
   const hiddenAnswerCount = Math.max(answerLines.length - shownAnswerLines.length, 0);
-  const metaLine = buildCollapsedMetaLine(details, hiddenAnswerCount, theme);
+  const metaLine = buildCollapsedMetaLine(details, hiddenAnswerCount, theme, reviewKey);
 
   return [formatStatusLine(details, theme), ...shownAnswerLines, ...(metaLine ? [metaLine] : [])];
 }
@@ -192,6 +196,7 @@ function buildCollapsedMetaLine(
   details: AskUserDetails,
   hiddenAnswerCount: number,
   theme: Theme,
+  reviewKey: string,
 ): string {
   const parts: string[] = [];
   const unansweredCount = details.responses.filter((r) => !r.answer.answered).length;
@@ -203,11 +208,13 @@ function buildCollapsedMetaLine(
     parts.push(`${hiddenAnswerCount} more answer${hiddenAnswerCount === 1 ? "" : "s"}`);
   }
 
-  const reviewKey = keyText("app.tools.expand") || DEFAULT_REVIEW_KEY;
-  const reviewHint = `${theme.fg("dim", reviewKey)}${theme.fg("muted", " to review")}`;
+  const reviewHint = reviewKey
+    ? `${theme.fg("dim", reviewKey)}${theme.fg("muted", " to review")}`
+    : "";
 
   if (parts.length === 0) return reviewHint;
-  return `${theme.fg("dim", parts.join(" · "))}${theme.fg("dim", " · ")}${reviewHint}`;
+  const meta = theme.fg("dim", parts.join(" · "));
+  return reviewHint ? `${meta}${theme.fg("dim", " · ")}${reviewHint}` : meta;
 }
 
 function formatStatusLine(details: AskUserDetails, theme: Theme): string {

package/node_modules/@mrclrchtr/supi-ask-user/src/ui/types.ts

@@ -25,7 +25,7 @@ export interface AskUserUiContext {
       keybindings: KeybindingsManager,
       done: (result: T) => void,
     ) => Component & { dispose?(): void },
-    options?: { overlay?: boolean },
+    options?: Pick<NonNullable<Parameters<ExtensionUIContext["custom"]>[1]>, "overlay" | "blocked">,
   ): Promise<T>;
 }
 

package/node_modules/@mrclrchtr/supi-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "11.1.0",
+  "version": "11.3.0",
   "description": "Shared settings, configuration, reporting, and session infrastructure",
   "license": "MIT",
   "repository": {

package/node_modules/@mrclrchtr/supi-core/src/child-web-tools.ts

@@ -0,0 +1,110 @@
+// Session-provided Web tools for SuPi child sessions (Agent Runs and Reviewer Sessions).
+//
+// The loaded supi-web extension answers a synchronous request on the parent event bus.
+// Consumers never depend on supi-web; when it is absent or provides no tools, the
+// request returns undefined and the child simply lacks Web tools.
+
+import type { ExtensionAPI, ExtensionFactory } from "@earendil-works/pi-coding-agent";
+
+/** Web tools that child sessions may receive when the containing session provides them. */
+export const CHILD_WEB_TOOL_NAMES = [
+  "web_fetch_md",
+  "web_search",
+  "web_docs_search",
+  "web_docs_fetch",
+] as const;
+
+/** One session-provided Web tool name. */
+export type ChildWebToolName = (typeof CHILD_WEB_TOOL_NAMES)[number];
+
+/**
+ * Web tools currently callable in the containing session plus a child-only extension
+ * factory that registers them. The factory must not capture the parent session; it may
+ * capture plain data such as the containing session's configuration directory.
+ */
+export interface ChildWebToolProvision {
+  readonly toolNames: readonly ChildWebToolName[];
+  /** Register the requested subset of `toolNames` in a child session. */
+  readonly createFactory: (toolNames: readonly ChildWebToolName[]) => ExtensionFactory;
+}
+
+/** Plain containing-session data supplied with a child Web tool request. */
+export interface ChildWebToolsRequestContext {
+  /**
+   * Working directory whose SuPi configuration governs Web settings such as Firecrawl.
+   * Children with a different cwd (for example a frozen Review Workspace) keep this policy.
+   */
+  readonly configCwd: string;
+}
+
+type EventBusLike = Pick<ExtensionAPI["events"], "on" | "emit">;
+
+const REQUEST_CHANNEL = "supi:child-web-tools:request";
+const RESPONSE_CHANNEL = "supi:child-web-tools:response";
+
+interface ChildWebToolsRequest extends ChildWebToolsRequestContext {
+  readonly requestId: string;
+}
+
+interface ChildWebToolsResponse {
+  readonly requestId: string;
+  readonly provision: ChildWebToolProvision;
+}
+
+let nextRequestId = 0;
+
+/**
+ * Answer child Web tool requests on the parent event bus. The callback must be synchronous
+ * because Pi's event bus does not await listeners. Returns an unsubscribe function.
+ */
+export function provideChildWebTools(
+  events: EventBusLike,
+  resolve: (context: ChildWebToolsRequestContext) => ChildWebToolProvision | undefined,
+): () => void {
+  return events.on(REQUEST_CHANNEL, (data) => {
+    const request = data as Partial<ChildWebToolsRequest> | undefined;
+    if (typeof request?.requestId !== "string" || typeof request.configCwd !== "string") return;
+    const { requestId, configCwd } = request;
+    const provision = resolve({ configCwd });
+    if (!provision || provision.toolNames.length === 0) return;
+    events.emit(RESPONSE_CHANNEL, { requestId, provision } satisfies ChildWebToolsResponse);
+  });
+}
+
+/** Capture the Web tools the containing session currently provides, if any. */
+export function requestChildWebTools(
+  events: EventBusLike,
+  context: ChildWebToolsRequestContext,
+): ChildWebToolProvision | undefined {
+  const requestId = `child-web-${process.pid}-${++nextRequestId}`;
+  let provision: ChildWebToolProvision | undefined;
+  const unsubscribe = events.on(RESPONSE_CHANNEL, (data) => {
+    const response = data as Partial<ChildWebToolsResponse> | undefined;
+    if (response?.requestId === requestId && response.provision) provision = response.provision;
+  });
+  try {
+    events.emit(REQUEST_CHANNEL, { requestId, ...context } satisfies ChildWebToolsRequest);
+  } finally {
+    unsubscribe();
+  }
+  return provision;
+}
+
+/**
+ * Return the Web tools callable in a session under Pi's exposure rules: active `direct`
+ * tools, plus registered `codemode` and `deferred` tools. `model-only` and `hidden`
+ * tools are not callable.
+ */
+export function callableChildWebToolNames(
+  pi: Pick<ExtensionAPI, "getAllTools" | "getActiveTools">,
+): ChildWebToolName[] {
+  const active = new Set(pi.getActiveTools());
+  const exposures = new Map(
+    pi.getAllTools().map((tool) => [tool.name, tool.exposure ?? "direct"] as const),
+  );
+  return CHILD_WEB_TOOL_NAMES.filter((name) => {
+    const exposure = exposures.get(name);
+    if (exposure === "direct") return active.has(name);
+    return exposure === "codemode" || exposure === "deferred";
+  });
+}

package/node_modules/@mrclrchtr/supi-core/src/session.ts

@@ -1,5 +1,16 @@
 // supi-core session domain — session utilities and registries.
 
+export type {
+  ChildWebToolName,
+  ChildWebToolProvision,
+  ChildWebToolsRequestContext,
+} from "./child-web-tools.ts";
+export {
+  CHILD_WEB_TOOL_NAMES,
+  callableChildWebToolNames,
+  provideChildWebTools,
+  requestChildWebTools,
+} from "./child-web-tools.ts";
 export { createRegistry, createSessionStateRegistry } from "./registry-utils.ts";
 export type {
   SessionCapabilitySkill,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-prompt-improver",
-  "version": "11.1.0",
+  "version": "11.3.0",
   "description": "Command-based prompt improvement with user-approved drafts",
   "license": "MIT",
   "repository": {
@@ -26,6 +26,7 @@
   ],
   "type": "module",
   "files": [
+    "CHANGELOG.md",
     "src/**/*.ts",
     "!__tests__"
   ],
@@ -42,8 +43,8 @@
     ]
   },
   "dependencies": {
-    "@mrclrchtr/supi-ask-user": "11.1.0",
-    "@mrclrchtr/supi-core": "11.1.0"
+    "@mrclrchtr/supi-ask-user": "11.3.0",
+    "@mrclrchtr/supi-core": "11.3.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-ask-user",

package/src/diagnostic-data.ts

@@ -134,6 +134,7 @@ const OBJECT_CAPTURE_KEYS = [
   "totalUsageUnits",
   "cost",
   "total",
+  "totalFromProvider",
   "contentShape",
   "namespace",
   "thoughtSignature",

package/src/diagnostic-snapshot.ts

@@ -143,12 +143,14 @@ function captureResponseUsage(response: unknown, target: Record<string, unknown>
   target.usage = result;
 }
 
-function copyCost(cost: Record<string, unknown>): Record<string, number> {
-  const result: Record<string, number> = {};
+function copyCost(cost: Record<string, unknown>): Record<string, number | boolean> {
+  const result: Record<string, number | boolean> = {};
   for (const key of ["input", "output", "cacheRead", "cacheWrite", "total"]) {
     const value = readProperty(cost, key);
     if (typeof value === "number" && Number.isFinite(value)) result[key] = value;
   }
+  const totalFromProvider = readProperty(cost, "totalFromProvider");
+  if (typeof totalFromProvider === "boolean") result.totalFromProvider = totalFromProvider;
   return result;
 }