pi-sage 0.2.13 → 0.2.14

package/.pi/extensions/sage/index.ts

@@ -7,14 +7,20 @@ import {
   isHardCostCapExceeded,
   makeBlockedResult
 } from "./policy.js";
-import { isSageRunnerPolicyError, runSageSingleShot } from "./runner.js";
+import {
+  isSageRunnerPolicyError,
+  runSageSingleShot,
+  type SageRunnerInput,
+  type SageRunnerOutput
+} from "./runner.js";
 import {
   getSettingsPathForScope,
   loadSettings,
   mergeSettings,
   saveSettings,
   type SageSettings,
-  type SettingsScope
+  type SettingsScope,
+  type ToolPolicySettings
 } from "./settings.js";
 import { checkVolumeCaps, getDisallowedCustomTools, resolveToolPolicy } from "./tool-policy.js";
 import type {
@@ -232,10 +238,8 @@ export default function registerSageExtension(pi: ExtensionAPI): void {
         });
       }
 
-      const toolPolicy = resolveToolPolicy(settings.toolPolicy);
-
       try {
-        const runnerResult = await runSageSingleShot({
+        const runnerInput: Omit<SageRunnerInput, "toolPolicy"> = {
           cwd: ctx.cwd,
           model: resolvedModel,
           reasoningLevel: settings.reasoningLevel,
@@ -246,11 +250,13 @@ export default function registerSageExtension(pi: ExtensionAPI): void {
           evidence: input.evidence,
           objective: input.objective,
           urgency: input.urgency,
-          toolPolicy: settings.toolPolicy,
           signal
-        });
+        };
+
+        const invocation = await runSageWithFallback(runnerInput, settings.toolPolicy);
+        const toolPolicy = resolveToolPolicy(invocation.toolPolicyUsed);
 
-        const volume = checkVolumeCaps(runnerResult.toolUsage, toolPolicy);
+        const volume = checkVolumeCaps(invocation.result.toolUsage, toolPolicy);
         if (!volume.ok) {
           return makeBlockedResult({
             mode,
@@ -266,21 +272,25 @@ export default function registerSageExtension(pi: ExtensionAPI): void {
         budgetState.callsThisTurn += 1;
         budgetState.sessionCalls += 1;
         if (mode === "autonomous") budgetState.lastAutoTurn = budgetState.currentTurn;
-        if (runnerResult.usage?.costTotal) budgetState.sessionCostTotal += runnerResult.usage.costTotal;
+        if (invocation.result.usage?.costTotal) budgetState.sessionCostTotal += invocation.result.usage.costTotal;
+
+        const contextReason = invocation.fallbackReason
+          ? "eligible; fallback to read-only-lite after blocked bash command"
+          : "eligible";
 
         return {
-          content: [{ type: "text", text: runnerResult.text }],
+          content: [{ type: "text", text: invocation.result.text }],
           details: {
             model: resolvedModel,
             reasoningLevel: settings.reasoningLevel,
-            latencyMs: runnerResult.latencyMs,
-            stopReason: runnerResult.stopReason,
-            usage: runnerResult.usage,
-            toolUsage: runnerResult.toolUsage,
+            latencyMs: invocation.result.latencyMs,
+            stopReason: invocation.result.stopReason,
+            usage: invocation.result.usage,
+            toolUsage: invocation.result.toolUsage,
             policy: {
               mode,
               allowedByContext: true,
-              contextReason: "eligible",
+              contextReason,
               allowedByBudget: true,
               budgetReason: softBudget.reason
             }
@@ -353,6 +363,32 @@ function formatRunnerPolicyReason(blockCode: BlockCode, reason: string): string
   return reason;
 }
 
+async function runSageWithFallback(
+  runnerInput: Omit<SageRunnerInput, "toolPolicy">,
+  toolPolicy: ToolPolicySettings
+): Promise<{ result: SageRunnerOutput; toolPolicyUsed: ToolPolicySettings; fallbackReason?: string }> {
+  try {
+    const result = await runSageSingleShot({ ...runnerInput, toolPolicy });
+    return { result, toolPolicyUsed: toolPolicy };
+  } catch (error) {
+    if (
+      isSageRunnerPolicyError(error) &&
+      error.blockCode === "tool-disallowed" &&
+      toolPolicy.profile === "git-review-readonly"
+    ) {
+      const fallbackPolicy: ToolPolicySettings = {
+        ...toolPolicy,
+        profile: "read-only-lite"
+      };
+
+      const result = await runSageSingleShot({ ...runnerInput, toolPolicy: fallbackPolicy });
+      return { result, toolPolicyUsed: fallbackPolicy, fallbackReason: error.message };
+    }
+
+    throw error;
+  }
+}
+
 function buildCallerContext(lastInputSource: InputSource | undefined, hasUI: boolean): CallerContext | null {
   if (!lastInputSource) return null;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-sage",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "private": false,
   "type": "module",
   "description": "Interactive-only advisory Sage extension for Pi",