Show resolved permission level on every tool in source views

- Add interaction field to SourceInspectionToolListItem so the API returns each tool's intrinsic interaction mode (auto/required) - Resolve actual permission level for every tool (no more "unknown" or "default") using the tool's interaction mode as fallback when no policy matches - Migrate OpenAPI and GraphQL plugins from renderDetail override to renderHeaderMeta/renderSchemaExtras props so policies and permission controls render in all plugin detail views - Fix Vite HMR for workspace packages: the reloadOnPluginChange handler was matching any path containing /plugins/ (including the react client's src/plugins/ subfolder), changed to only match the top-level plugins/ workspace directory - Enable polling in Vite watcher for reliable WSL2 file change detection

Rhys Sullivan committed 7 months ago

Commit 5ddc2861 parent 500303a8 files · +55 −37Browse files

Unified · Split

8 files

apps/web/vite.config.ts +5 −2
packages/clients/react/src/plugins/components/source-tool-explorer.tsx +17 −1
packages/clients/react/src/plugins/components/source-tool-workbench.tsx +7 −3
packages/clients/react/src/plugins/components/tool-permission-badge.tsx +19 −16
packages/platform/sdk/src/schema/models/source-inspection.ts +1 −0
packages/platform/sdk/src/sources/inspection.ts +3 −0
plugins/graphql/react/components.tsx +1 −7
plugins/openapi/react/components.tsx +2 −8

apps/web/vite.config.ts+5−2

   (name) => name.startsWith("@executor/"),
 );
-const pluginWorkspaceSegment = `${path.sep}plugins${path.sep}`;
+const pluginsWorkspaceRoot = path.resolve(import.meta.dirname, "../../plugins") + path.sep;
 const reloadOnPluginChange = () => ({
   name: "executor-reload-on-plugin-change",
   handleHotUpdate({ file, server }: { file: string; server: { hot: { send: (payload: { type: "full-reload" }) => void } } }) {
-    if (!file.includes(pluginWorkspaceSegment)) {
+    if (!file.startsWith(pluginsWorkspaceRoot)) {
       return;
     }
       ignored: [
         "!**/node_modules/@executor/**",
       ],
+      // WSL2 inotify doesn't reliably detect changes through symlinked workspace packages
+      usePolling: true,
+      interval: 500,
     },
   },
 });

packages/clients/react/src/plugins/components/source-tool-explorer.tsx+17−1

 import { Badge } from "./ui/badge";
 import { LoadableBlock } from "./loadable";
 import {
+  SourceToolDetailPanel,
   SourceToolModelWorkbench,
   type ToolPermissionChangeRequest,
 } from "./source-tool-workbench";
   actions?: ReactNode;
   summary?: ReactNode;
   policies?: ReadonlyArray<LocalScopePolicy>;
+  renderHeaderMeta?: (detail: SourceInspectionToolDetail) => ReactNode;
+  renderSchemaExtras?: (detail: SourceInspectionToolDetail) => ReactNode;
   renderDetail?: (detail: SourceInspectionToolDetail) => ReactNode;
 }) => {
   const inspection = useSourceInspection(props.sourceId);
                   });
                 }}
                 sourceId={props.sourceId}
-                renderDetail={props.renderDetail}
+                renderDetail={props.renderDetail ?? (
+                  (props.renderHeaderMeta || props.renderSchemaExtras)
+                    ? (toolDetail) => (
+                      <SourceToolDetailPanel
+                        detail={toolDetail}
+                        policies={policies}
+                        onSetPermission={handleSetPermission}
+                        permissionPending={permissionPending}
+                        renderHeaderMeta={props.renderHeaderMeta}
+                        renderSchemaExtras={props.renderSchemaExtras}
+                      />
+                    )
+                    : undefined
+                )}
               />
             </div>
           </div>

packages/clients/react/src/plugins/components/source-tool-workbench.tsx+7−3

         {highlightMatch(label, props.search)}
       </span>
       {props.tool.method && <MethodBadge method={props.tool.method} />}
-      {props.policies && props.policies.length > 0 && (
+      {props.policies && (
-        <ToolPermissionDot toolPath={props.tool.path} policies={props.policies} />
+        <ToolPermissionDot
+          toolPath={props.tool.path}
+          policies={props.policies}
+          interaction={props.tool.interaction}
+        />
       )}
     </Button>
   );
               {props.detail.summary.method && (
                 <MethodBadge method={props.detail.summary.method} />
               )}
-              {props.policies && props.policies.length > 0 && (
+              {props.policies && (
                 <ToolPermissionBadge
                   toolPath={props.detail.summary.path}
                   policies={props.policies}

packages/clients/react/src/plugins/components/tool-permission-badge.tsx+19−16

 import type {
   LocalScopePolicy,
-  LocalScopePolicyApprovalMode,
-  LocalScopePolicyEffect,
 } from "@executor/platform-sdk/schema";
 import { cn } from "../lib/cn";
-export type ToolPermissionLevel = "auto-run" | "requires-approval" | "denied" | "unknown";
+export type ToolPermissionLevel = "auto-run" | "requires-approval" | "denied";
 const matchesGlob = (pattern: string, value: string): boolean => {
   const escaped = pattern
 export const resolveToolPermission = (
   toolPath: string,
   policies: ReadonlyArray<LocalScopePolicy>,
+  toolInteraction?: "auto" | "required",
 ): {
   level: ToolPermissionLevel;
   matchedPolicy: LocalScopePolicy | null;
   const matched = matching[0];
   if (!matched) {
-    return { level: "unknown", matchedPolicy: null };
+    // No explicit policy — resolve from the tool's intrinsic interaction mode
+    const defaultLevel: ToolPermissionLevel =
+      toolInteraction === "auto" ? "auto-run" : "requires-approval";
+    return { level: defaultLevel, matchedPolicy: null };
   }
   if (matched.effect === "deny") {
     dotClass: "bg-red-500",
     textClass: "text-red-600 dark:text-red-400",
   },
-  unknown: {
-    label: "",
-    dotClass: "bg-muted-foreground/30",
-    textClass: "text-muted-foreground/50",
-  },
 };
 export const ToolPermissionDot = (props: {
   toolPath: string;
   policies: ReadonlyArray<LocalScopePolicy>;
+  interaction?: "auto" | "required";
   className?: string;
 }) => {
-  const { level } = resolveToolPermission(props.toolPath, props.policies);
+  const { level } = resolveToolPermission(props.toolPath, props.policies, props.interaction);
-  if (level === "unknown") return null;
   const style = permissionStyles[level];
   return (
     <span
-      className={cn("size-1.5 shrink-0 rounded-full", style.dotClass, props.className)}
+      className={cn(
+        "inline-flex shrink-0 items-center gap-1 rounded-full px-1.5 py-px text-[9px] font-medium leading-none",
+        style.textClass,
+        props.className,
+      )}
       title={style.label}
-    />
+    >
+      <span className={cn("size-1.5 rounded-full", style.dotClass)} />
+      {style.label}
+    </span>
   );
 };
 export const ToolPermissionBadge = (props: {
   toolPath: string;
   policies: ReadonlyArray<LocalScopePolicy>;
+  interaction?: "auto" | "required";
   className?: string;
 }) => {
   const { level, matchedPolicy } = resolveToolPermission(
     props.toolPath,
     props.policies,
+    props.interaction,
   );
-  if (level === "unknown") return null;
   const style = permissionStyles[level];
   return (

packages/platform/sdk/src/schema/models/source-inspection.ts+1−0

@@ -60,6 +60,7 @@ export const SourceInspectionSectionSchema = Schema.Union( · 59 unmodified lines
60	export const SourceInspectionToolListItemSchema = Schema.Struct({	60	export const SourceInspectionToolListItemSchema = Schema.Struct({
61	path: Schema.String,	61	path: Schema.String,
62	method: Schema.NullOr(Schema.String),	62	method: Schema.NullOr(Schema.String),
		63	interaction: Schema.optional(Schema.Literal("auto", "required")),
63	inputTypePreview: Schema.optional(Schema.String),	64	inputTypePreview: Schema.optional(Schema.String),
64	outputTypePreview: Schema.optional(Schema.String),	65	outputTypePreview: Schema.optional(Schema.String),
65	});	66	});

packages/platform/sdk/src/sources/inspection.ts+3−0

 ): SourceInspectionToolListItem => ({
   path: tool.path,
   method: executableDetails(tool).method,
+  ...(tool.descriptor.interaction
+    ? { interaction: tool.descriptor.interaction }
+    : {}),
   ...(tool.descriptor.contract?.inputTypePreview
     ? { inputTypePreview: tool.descriptor.contract.inputTypePreview }
     : {}),

plugins/graphql/react/components.tsx+1−7

   Input,
   Label,
   Select,
-  SourceToolDetailPanel,
   SourceToolExplorer,
   Textarea,
   parseSourceToolExplorerSearch,
           )}
         </>
       )}
-      renderDetail={(detail) => (
+      renderHeaderMeta={renderGraphqlToolHeaderMeta}
-        <SourceToolDetailPanel
-          detail={detail}
-          renderHeaderMeta={renderGraphqlToolHeaderMeta}
-        />
-      )}
     />
   );
 }

plugins/openapi/react/components.tsx+2−8

   Input,
   Label,
   Select,
-  SourceToolDetailPanel,
   SourceToolExplorer,
   parseSourceToolExplorerSearch,
   type SourceToolExplorerSearch,
           )}
         </>
       )}
-      renderDetail={(detail) => (
+      renderHeaderMeta={renderOpenApiToolHeaderMeta}
-        <SourceToolDetailPanel
+      renderSchemaExtras={renderOpenApiToolSchemaExtras}
-          detail={detail}
-          renderHeaderMeta={renderOpenApiToolHeaderMeta}
-          renderSchemaExtras={renderOpenApiToolSchemaExtras}
-        />
-      )}
     />
   );
 }