pi-sage 0.2.14 → 0.2.15

package/.pi/extensions/sage/caller-context.ts

@@ -0,0 +1,50 @@
+import type { CallerContext } from "./types.js";
+
+export type InputSource = "interactive" | "rpc" | "extension";
+export type InteractiveOrRpcSource = "interactive" | "rpc";
+
+export function isKnownInputSource(value: string): value is InputSource {
+  return value === "interactive" || value === "rpc" || value === "extension";
+}
+
+export function updateLastInteractiveOrRpcSource(
+  previous: InteractiveOrRpcSource | undefined,
+  source: string
+): InteractiveOrRpcSource | undefined {
+  if (source === "interactive" || source === "rpc") {
+    return source;
+  }
+  return previous;
+}
+
+export function buildCallerContextFromSignals(input: {
+  lastInteractiveOrRpcSource: InteractiveOrRpcSource | undefined;
+  unknownSourceSeen: boolean;
+  hasUI: boolean;
+  roleHint?: string;
+  isCI?: boolean;
+  isSubagent?: boolean;
+}): CallerContext | null {
+  const { lastInteractiveOrRpcSource, unknownSourceSeen, hasUI, roleHint, isCI, isSubagent } = input;
+  if (unknownSourceSeen) return null;
+  if (!lastInteractiveOrRpcSource) return null;
+
+  const normalizedRole = roleHint?.trim().toLowerCase();
+  const isRpcSource = lastInteractiveOrRpcSource === "rpc";
+  const interactive = hasUI && lastInteractiveOrRpcSource === "interactive";
+  const isInteractiveSupervisor = interactive && normalizedRole === "supervisor";
+
+  return {
+    session: {
+      interactive
+    },
+    agent: {
+      role: normalizedRole ?? "primary",
+      isSubagent: Boolean(isSubagent),
+      isRpcOrchestrated: isRpcSource || Boolean(normalizedRole && normalizedRole !== "primary" && !isInteractiveSupervisor)
+    },
+    runtime: {
+      mode: isCI ? "ci" : hasUI ? (isRpcSource ? "rpc" : "interactive") : "non-interactive"
+    }
+  };
+}

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

@@ -7,6 +7,12 @@ import {
   isHardCostCapExceeded,
   makeBlockedResult
 } from "./policy.js";
+import {
+  buildCallerContextFromSignals,
+  isKnownInputSource,
+  updateLastInteractiveOrRpcSource,
+  type InteractiveOrRpcSource
+} from "./caller-context.js";
 import {
   isSageRunnerPolicyError,
   runSageSingleShot,
@@ -34,8 +40,6 @@ import type {
   ToolProfile
 } from "./types.js";
 
-type InputSource = "interactive" | "rpc" | "extension";
-
 type ModelLike = {
   provider: string;
   id: string;
@@ -74,12 +78,22 @@ export default function registerSageExtension(pi: ExtensionAPI): void {
     sessionCostTotal: 0
   };
 
-  let lastInputSource: InputSource | undefined;
+  let lastInteractiveOrRpcSource: InteractiveOrRpcSource | undefined;
+  let unknownInputSourceSeen = false;
 
   pi.on("input", (event) => {
-    if (event.source === "interactive" || event.source === "rpc" || event.source === "extension") {
-      lastInputSource = event.source;
+    const source = String(event.source ?? "");
+
+    if (!isKnownInputSource(source)) {
+      unknownInputSourceSeen = true;
+      return { action: "continue" };
     }
+
+    lastInteractiveOrRpcSource = updateLastInteractiveOrRpcSource(lastInteractiveOrRpcSource, source);
+    if (source === "interactive" || source === "rpc") {
+      unknownInputSourceSeen = false;
+    }
+
     return { action: "continue" };
   });
 
@@ -166,7 +180,7 @@ export default function registerSageExtension(pi: ExtensionAPI): void {
         });
       }
 
-      const callerContext = buildCallerContext(lastInputSource, ctx.hasUI);
+      const callerContext = buildCallerContext(lastInteractiveOrRpcSource, unknownInputSourceSeen, ctx.hasUI);
       const eligibility = isEligibleCaller(callerContext);
       if (!eligibility.ok) {
         return makeBlockedResult({
@@ -389,28 +403,19 @@ async function runSageWithFallback(
   }
 }
 
-function buildCallerContext(lastInputSource: InputSource | undefined, hasUI: boolean): CallerContext | null {
-  if (!lastInputSource) return null;
-
-  const roleHint = getRoleHint();
-  const isRpcSource = lastInputSource === "rpc";
-  const isSubagent = process.env.PI_SAGE_SUBAGENT === "1";
-  const interactive = hasUI && lastInputSource === "interactive";
-  const isInteractiveSupervisor = interactive && roleHint === "supervisor";
-
-  return {
-    session: {
-      interactive
-    },
-    agent: {
-      role: roleHint ?? "primary",
-      isSubagent,
-      isRpcOrchestrated: isRpcSource || Boolean(roleHint && roleHint !== "primary" && !isInteractiveSupervisor)
-    },
-    runtime: {
-      mode: process.env.CI ? "ci" : hasUI ? (isRpcSource ? "rpc" : "interactive") : "non-interactive"
-    }
-  };
+function buildCallerContext(
+  lastInteractiveOrRpcSource: InteractiveOrRpcSource | undefined,
+  unknownInputSourceSeen: boolean,
+  hasUI: boolean
+): CallerContext | null {
+  return buildCallerContextFromSignals({
+    lastInteractiveOrRpcSource,
+    unknownSourceSeen: unknownInputSourceSeen,
+    hasUI,
+    roleHint: getRoleHint(),
+    isCI: Boolean(process.env.CI),
+    isSubagent: process.env.PI_SAGE_SUBAGENT === "1"
+  });
 }
 
 function getRoleHint(): string | undefined {

package/package.json

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