pi-advisor-flow 0.10.0 → 0.11.0

package/CHANGELOG.md

@@ -4,7 +4,16 @@ All notable changes to this project are documented here.
 
 The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0/).
 
-## Unreleased
+## 0.11.0 - 2026-10-03
+
+### Added
+
+- Native Pi Codemode composition for `ask_advisor`: scripts receive structured advice, IDs, normalized usage, and existing skip metadata, while interactive responses remain unchanged. Documented deterministic-check composition and explicit draft disclosure limits.
+
+### Fixed
+
+- Advisor invocation guidelines no longer replace the whole system prompt, so prompt sections from other extensions, such as the list of MCP servers, still reach the model.
+- Braces Vulnerability patched (CVE-2026-93687)
 
 ## 0.10.0 - 2026-10-02
 

package/README.md

@@ -89,6 +89,37 @@ In the Settings, enable Simple Mode for a quick start.
 
 Unknown fields in `advisor.json` are preserved for forward compatibility and reported as non-blocking warnings. Invalid recognized values fail their own Advisor call with a clear message instead of blocking every tool call.
 
+## Pi Codemode
+
+With Pi Codemode enabled and the Advisor flow active, call the existing tool through `tools.ask_advisor`; no separate review tool or workflow is needed:
+
+```js
+const commands = ["bun test", "bun run typecheck"];
+const checks = await Promise.all(
+  commands.map(async (command) => {
+    const result = await tools.bash({ command });
+    return {
+      command,
+      exit_code: result.exit_code,
+      truncated: result.truncated,
+    };
+  })
+);
+return await tools.ask_advisor({
+  draft: JSON.stringify({
+    checks,
+    remainingRisk: "Runtime behavior needs review.",
+  }),
+  gitContext: "full",
+});
+```
+
+Gather and filter deterministic results before paying for Advisor reasoning. Nested results are not transcript entries, so they are not automatically available to reconstructed Advisor context. Use the existing `draft` for permitted, concise summaries (8 KiB after optional redaction); these remain untrusted Executor claims, not independently verified evidence. `question` can focus a specific decision; omit it for general reviews. Use `gitContext` for patches so the user's configured disclosure ceiling applies, rather than copying a diff into the draft.
+
+Codemode receives `{ text, adviceId?, advisor?, followUp?, usage?, jev?, skipReason? }`. `text` preserves Advisor Markdown or the existing skip notice; `usage` is the same normalized snapshot shown in response details. Skipped calls have no new `adviceId`. Provider failures and blocked calls reject. Regular consultations never become loop-gate decisions. Interactive responses and usage accounting are unchanged.
+
+Draft text is explicit disclosure: it does **not** inherit the policies of the tools that produced it. Do not copy excluded tool output, secrets, or unconsented file bodies into `draft` or `question`. Jev may also receive the draft when screening is enabled. See [Privacy and data handling](docs/privacy.md).
+
 ## Usage and accounting
 
 Advisor responses show provider-reported input, output, cache, and cost details when available. Successful `ask_advisor` calls also carry normalized usage into Pi's built-in `/cost` totals. Manual consultations and automatic gates keep their own session-local accounting instead, so nothing is double-counted. Missing or partial provider usage is shown as unavailable rather than fabricated as zero. `/advisor-settings` controls both the per-response details and the optional cumulative footer independently. Configure `advisorFallbackModel` or choose **Fallback Advisor model** in the model/settings pickers to retry one failed primary request; the final response is labelled with the model that answered, and both failures are shown together.

package/dist/index.js

@@ -8399,7 +8399,32 @@ var registerJevTurnGate = (on, registration) => {
 };
 
 // src/tools/register-ask-advisor.ts
+import { Type as Type2 } from "typebox";
+
+// src/tools/advisor-output.ts
 import { Type } from "typebox";
+var advisorOutputSchema = Type.Object({
+  adviceId: Type.Optional(Type.String()),
+  advisor: Type.Optional(Type.String()),
+  followUp: Type.Optional(Type.Boolean()),
+  jev: Type.Optional(Type.Object({
+    kind: Type.Union([Type.Literal("screened"), Type.Literal("repeat")]),
+    reason: Type.String(),
+    skipped: Type.Boolean()
+  })),
+  skipReason: Type.Optional(Type.String()),
+  text: Type.String({
+    description: "Advisor Markdown or consultation skip notice."
+  }),
+  usage: Type.Optional(Type.Object({
+    cacheRead: Type.Optional(Type.Number()),
+    cacheWrite: Type.Optional(Type.Number()),
+    cost: Type.Optional(Type.Number()),
+    input: Type.Optional(Type.Number()),
+    output: Type.Optional(Type.Number()),
+    totalTokens: Type.Optional(Type.Number())
+  }))
+});
 
 // src/tools/render-advisor-result.ts
 import { getMarkdownTheme as getMarkdownTheme4 } from "@earendil-works/pi-coding-agent";
@@ -8580,7 +8605,8 @@ var skippedSameModelResult = (id, notice, reservedCalls, session) => {
     details: {
       skipReason: notice,
       text: notice
-    }
+    },
+    structuredContent: { skipReason: notice, text: notice }
   };
 };
 var claimTrackedHandoff = (session, includeTrackedFiles) => {
@@ -8603,7 +8629,7 @@ var registerAskAdvisorTool = ({
   session
 }) => {
   pi.registerTool({
-    description: "Consult the on-demand Advisor model for strategic guidance. Call with an empty object for a contextual review; attach an optional draft for concrete plan or completion review. Use followUpTo with a new question to continue one cached consultation without rebuilding its redacted context. If the Advisor explicitly names a missing file, you may make a sequential fresh consultation with includeTrackedFiles when enabled and relevant.",
+    description: "Consult the on-demand Advisor model for strategic guidance. Call with an empty object for a contextual review; attach an optional draft for concrete plan or completion review. Use followUpTo with a new question to continue one cached consultation without rebuilding its redacted context. If the Advisor explicitly names a missing file, you may make a sequential fresh consultation with includeTrackedFiles when enabled and relevant. In Pi Codemode, gather and filter deterministic tool results first, then call tools.ask_advisor. Nested results are not automatically reconstructed: pass only permitted, concise summaries in draft (untrusted, capped at 8 KiB, not independently verified). Draft does not inherit source-tool disclosure policies; use gitContext for patches within the user's allowance.",
     async execute(_id, params, signal, onUpdate, ctx) {
       let followUp;
       try {
@@ -8648,16 +8674,18 @@ var registerAskAdvisorTool = ({
           const skipText = screeningSkipText(screening);
           session.releaseCall(_id);
           reservedCalls.delete(_id);
+          const skipped = {
+            jev: {
+              kind: screening.kind,
+              reason: screening.reason,
+              skipped: true
+            },
+            text: skipText
+          };
           return {
             content: [{ text: skipText, type: "text" }],
-            details: {
-              jev: {
-                kind: screening.kind,
-                reason: screening.reason,
-                skipped: true
-              },
-              text: skipText
-            }
+            details: skipped,
+            structuredContent: skipped
           };
         }
         if (sameModelAdvisorDisabled(ctx, ctx.model, followUp?.payload.model)) {
@@ -8745,6 +8773,15 @@ var registerAskAdvisorTool = ({
           if (usage) {
             details.usage = usage;
           }
+          const structuredContent = {
+            adviceId: result.adviceId,
+            advisor: result.model,
+            followUp: Boolean(result.followUp),
+            text: result.markdown
+          };
+          if (usage) {
+            structuredContent.usage = usage;
+          }
           const response = {
             content: [
               {
@@ -8754,7 +8791,8 @@ ${result.markdown}`,
                 type: "text"
               }
             ],
-            details
+            details,
+            structuredContent
           };
           if (piUsage) {
             response.usage = piUsage;
@@ -8783,26 +8821,27 @@ ${result.markdown}`,
     },
     label: "Ask Advisor",
     name: "ask_advisor",
-    parameters: Type.Object({
-      draft: Type.Optional(Type.String({
+    outputSchema: advisorOutputSchema,
+    parameters: Type2.Object({
+      draft: Type2.Optional(Type2.String({
         description: "Concise untrusted draft for plan or completion review; claims are not verification evidence."
       })),
-      followUpTo: Type.Optional(Type.String({
+      followUpTo: Type2.Optional(Type2.String({
         description: "Opaque adviceId from a prior successful consultation. Requires a new non-empty question and reuses that consultation's redacted payload; do not combine with draft, Git context, or file attachments."
       })),
-      force: Type.Optional(Type.Boolean({
+      force: Type2.Optional(Type2.Boolean({
         description: "Set true only when you judge a decision genuinely material after a consultation was screened out; bypasses screening."
       })),
-      gitContext: Type.Optional(Type.Union([Type.Literal("none"), Type.Literal("summary"), Type.Literal("full")], {
+      gitContext: Type2.Optional(Type2.Union([Type2.Literal("none"), Type2.Literal("summary"), Type2.Literal("full")], {
         description: "How much of the working tree to include. Use full when the review depends on the exact code changes, such as a completion review. Use summary for changed file names only, or none when the question is not about the current changes. The user's configured allowance is the ceiling and a larger request is narrowed to it."
       })),
-      includeTrackedFiles: Type.Optional(Type.Array(Type.String({
+      includeTrackedFiles: Type2.Optional(Type2.Array(Type2.String({
         description: "Exact tracked repository-relative files to attach after the Advisor explicitly names a file it cannot review. Requires global advisorTrackedFileContent consent; current working-tree contents are sent as untrusted data."
       }))),
-      includeUntracked: Type.Optional(Type.Array(Type.String({
+      includeUntracked: Type2.Optional(Type2.Array(Type2.String({
         description: "Exact new repository-relative files to include only when user configuration allows it."
       }))),
-      question: Type.Optional(Type.String({
+      question: Type2.Optional(Type2.String({
         description: "The specific question or decision to get advice on. Omit this for normal reviews: the Advisor already has the conversation context."
       }))
     }),
@@ -8986,7 +9025,9 @@ var registerToolLifecycle = ({
       ctx.ui.setStatus("advisor-usage", undefined);
     }
   });
-  pi.on("before_agent_start", (_event, ctx) => {
+  pi.on("before_agent_start", (event, ctx) => {
+    const { sections } = event.systemPromptOptions;
+    delete sections.advisor_invocation_settings;
     if (!pi.getActiveTools().includes("ask_advisor")) {
       return;
     }
@@ -9000,13 +9041,11 @@ var registerToolLifecycle = ({
       guidelines.push(`Advisor calls remaining this session: ${budget}.
 Reserve calls for material decisions, repeated failures, or final review.`);
     }
-    return guidelines.length > 0 ? {
-      systemPrompt: `${ctx.getSystemPrompt()}
-
-Advisor invocation settings:
+    if (guidelines.length > 0) {
+      sections.advisor_invocation_settings = `Advisor invocation settings:
 ${guidelines.map((rule) => `- ${rule}`).join(`
-`)}`
-    } : undefined;
+`)}`;
+    }
   });
   pi.on("input", () => {
     session.clearFollowUps();
@@ -9067,7 +9106,7 @@ ${guidelines.map((rule) => `- ${rule}`).join(`
 
 // src/tools/register-outcome.ts
 import { Text as Text6 } from "@earendil-works/pi-tui";
-import { Type as Type2 } from "typebox";
+import { Type as Type3 } from "typebox";
 var registerOutcomeTool = ({
   appendOutcome: appendAdvisorOutcome,
   pi,
@@ -9121,10 +9160,10 @@ var registerOutcomeTool = ({
     },
     label: "Record Advisor Outcome",
     name: "record_advisor_outcome",
-    parameters: Type2.Object({
-      adoption: Type2.String({ enum: ADOPTIONS }),
-      adviceId: Type2.String(),
-      validationStatus: Type2.String({ enum: VALIDATIONS })
+    parameters: Type3.Object({
+      adoption: Type3.String({ enum: ADOPTIONS }),
+      adviceId: Type3.String(),
+      validationStatus: Type3.String({ enum: VALIDATIONS })
     }),
     renderCall: () => new Text6("[advisor] Record outcome", 0, 0),
     renderResult: (result) => new Text6(textFrom(result.content), 0, 0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-advisor-flow",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Advanced Executor/Advisor flow for Pi, fully configurable and extendable.",
   "keywords": [
     "advisor",
@@ -93,6 +93,7 @@
   },
   "overrides": {
     "brace-expansion": "5.0.12",
+    "braces": "github:micromatch/braces#d0d575e55e74a4e0218e5248fafb79efc3e54ebb",
     "is-unicode-supported": "npm:@socketregistry/is-unicode-supported@1.0.5",
     "safe-buffer": "npm:@socketregistry/safe-buffer@1.0.9",
     "undici": "8.11.2"

package/src/tools/advisor-output.ts

@@ -0,0 +1,28 @@
+import { Type } from "typebox";
+
+export const advisorOutputSchema = Type.Object({
+  adviceId: Type.Optional(Type.String()),
+  advisor: Type.Optional(Type.String()),
+  followUp: Type.Optional(Type.Boolean()),
+  jev: Type.Optional(
+    Type.Object({
+      kind: Type.Union([Type.Literal("screened"), Type.Literal("repeat")]),
+      reason: Type.String(),
+      skipped: Type.Boolean(),
+    })
+  ),
+  skipReason: Type.Optional(Type.String()),
+  text: Type.String({
+    description: "Advisor Markdown or consultation skip notice.",
+  }),
+  usage: Type.Optional(
+    Type.Object({
+      cacheRead: Type.Optional(Type.Number()),
+      cacheWrite: Type.Optional(Type.Number()),
+      cost: Type.Optional(Type.Number()),
+      input: Type.Optional(Type.Number()),
+      output: Type.Optional(Type.Number()),
+      totalTokens: Type.Optional(Type.Number()),
+    })
+  ),
+});

package/src/tools/register-ask-advisor.ts

@@ -3,6 +3,7 @@ import type {
   ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
+import type { Static } from "typebox";
 
 import {
   advisorRef,
@@ -22,6 +23,7 @@ import {
   advisorUsageForPi,
   snapshotAdvisorUsage,
 } from "../usage.ts";
+import { advisorOutputSchema } from "./advisor-output.ts";
 import { assertAdvisorFollowUpPrivacy } from "./consultation.ts";
 import { notifyLocalFailure, updateAdvisorUsageStatus } from "./gate-policy.ts";
 import { normalizeScreeningQuestion, screeningSkipText } from "./jev-filter.ts";
@@ -106,6 +108,7 @@ const skippedSameModelResult = (
       skipReason: notice,
       text: notice,
     },
+    structuredContent: { skipReason: notice, text: notice },
   };
 };
 
@@ -138,7 +141,7 @@ export const registerAskAdvisorTool = ({
 }: ToolRegistrationContext): void => {
   pi.registerTool({
     description:
-      "Consult the on-demand Advisor model for strategic guidance. Call with an empty object for a contextual review; attach an optional draft for concrete plan or completion review. Use followUpTo with a new question to continue one cached consultation without rebuilding its redacted context. If the Advisor explicitly names a missing file, you may make a sequential fresh consultation with includeTrackedFiles when enabled and relevant.",
+      "Consult the on-demand Advisor model for strategic guidance. Call with an empty object for a contextual review; attach an optional draft for concrete plan or completion review. Use followUpTo with a new question to continue one cached consultation without rebuilding its redacted context. If the Advisor explicitly names a missing file, you may make a sequential fresh consultation with includeTrackedFiles when enabled and relevant. In Pi Codemode, gather and filter deterministic tool results first, then call tools.ask_advisor. Nested results are not automatically reconstructed: pass only permitted, concise summaries in draft (untrusted, capped at 8 KiB, not independently verified). Draft does not inherit source-tool disclosure policies; use gitContext for patches within the user's allowance.",
     async execute(_id, params, signal, onUpdate, ctx) {
       let followUp:
         | { adviceId: string; payload: AdvisorFollowUpPayload }
@@ -200,16 +203,18 @@ export const registerAskAdvisorTool = ({
           const skipText = screeningSkipText(screening);
           session.releaseCall(_id);
           reservedCalls.delete(_id);
+          const skipped = {
+            jev: {
+              kind: screening.kind,
+              reason: screening.reason,
+              skipped: true,
+            },
+            text: skipText,
+          };
           return {
             content: [{ text: skipText, type: "text" }],
-            details: {
-              jev: {
-                kind: screening.kind,
-                reason: screening.reason,
-                skipped: true,
-              },
-              text: skipText,
-            },
+            details: skipped,
+            structuredContent: skipped,
           };
         }
         if (sameModelAdvisorDisabled(ctx, ctx.model, followUp?.payload.model)) {
@@ -332,6 +337,15 @@ export const registerAskAdvisorTool = ({
           if (usage) {
             details.usage = usage;
           }
+          const structuredContent: Static<typeof advisorOutputSchema> = {
+            adviceId: result.adviceId,
+            advisor: result.model,
+            followUp: Boolean(result.followUp),
+            text: result.markdown,
+          };
+          if (usage) {
+            structuredContent.usage = usage;
+          }
           const response: AgentToolResult<AdvisorToolDetails> = {
             content: [
               {
@@ -340,6 +354,7 @@ export const registerAskAdvisorTool = ({
               },
             ],
             details,
+            structuredContent,
           };
           if (piUsage) {
             response.usage = piUsage;
@@ -372,6 +387,7 @@ export const registerAskAdvisorTool = ({
     },
     label: "Ask Advisor",
     name: "ask_advisor",
+    outputSchema: advisorOutputSchema,
     parameters: Type.Object({
       draft: Type.Optional(
         Type.String({

package/src/tools/register-lifecycle.ts

@@ -71,7 +71,9 @@ export const registerToolLifecycle = ({
     }
   });
 
-  pi.on("before_agent_start", (_event, ctx) => {
+  pi.on("before_agent_start", (event, ctx) => {
+    const { sections } = event.systemPromptOptions;
+    delete sections.advisor_invocation_settings;
     if (!pi.getActiveTools().includes("ask_advisor")) {
       return;
     }
@@ -88,11 +90,9 @@ export const registerToolLifecycle = ({
         `Advisor calls remaining this session: ${budget}.\nReserve calls for material decisions, repeated failures, or final review.`
       );
     }
-    return guidelines.length > 0
-      ? {
-          systemPrompt: `${ctx.getSystemPrompt()}\n\nAdvisor invocation settings:\n${guidelines.map((rule) => `- ${rule}`).join("\n")}`,
-        }
-      : undefined;
+    if (guidelines.length > 0) {
+      sections.advisor_invocation_settings = `Advisor invocation settings:\n${guidelines.map((rule) => `- ${rule}`).join("\n")}`;
+    }
   });
 
   pi.on("input", () => {