@mrclrchtr/supi-consulting 11.0.1 → 11.2.0

package/src/config.ts

@@ -1,4 +1,7 @@
-import { loadSupiConfig } from "@mrclrchtr/supi-core/config";
+import { constants } from "node:fs";
+import { access, realpath, stat } from "node:fs/promises";
+import { isAbsolute } from "node:path";
+import { loadSupiConfig, loadSupiConfigForScope } from "@mrclrchtr/supi-core/config";
 
 /** The persisted SuPi configuration section owned by this package. */
 export const CONSULTING_CONFIG_SECTION = "consulting";
@@ -7,20 +10,73 @@ export const CONSULTING_CONFIG_SECTION = "consulting";
 export interface ConsultingConfig extends Record<string, unknown> {
   /** Enable agent availability discovery and the consulting_run tool. */
   agentToolEnabled: boolean;
+  /** Absolute directories available for inspection with either Workspace Access selection. */
+  additionalReadOnlyDirectories: readonly string[];
 }
 
 /** Default Consulting configuration. */
 export const CONSULTING_DEFAULTS: ConsultingConfig = Object.freeze({
   agentToolEnabled: true,
+  additionalReadOnlyDirectories: Object.freeze([]),
 });
 
-/** Load only the new consulting configuration section for a workspace. */
-export function loadConsultingConfig(cwd: string, homeDir?: string): ConsultingConfig {
-  const raw = loadSupiConfig(CONSULTING_CONFIG_SECTION, cwd, CONSULTING_DEFAULTS, { homeDir });
+/** Load trusted scoped configuration; untrusted projects cannot grant external directory access. */
+export function loadConsultingConfig(
+  cwd: string,
+  homeDir?: string,
+  projectTrusted = true,
+): ConsultingConfig {
+  const raw = projectTrusted
+    ? loadSupiConfig(CONSULTING_CONFIG_SECTION, cwd, CONSULTING_DEFAULTS, { homeDir })
+    : loadSupiConfigForScope(CONSULTING_CONFIG_SECTION, cwd, CONSULTING_DEFAULTS, {
+        scope: "global",
+        homeDir,
+      });
   return {
     agentToolEnabled:
       typeof raw.agentToolEnabled === "boolean"
         ? raw.agentToolEnabled
         : CONSULTING_DEFAULTS.agentToolEnabled,
+    additionalReadOnlyDirectories: validateAdditionalReadOnlyDirectories(
+      raw.additionalReadOnlyDirectories,
+    ),
   };
 }
+
+/** Validate directory-list syntax before persistence or execution; paths are literal, not globs. */
+export function validateAdditionalReadOnlyDirectories(value: unknown): string[] {
+  if (
+    !Array.isArray(value) ||
+    value.some((path) => typeof path !== "string" || !isAbsolute(path) || path.includes("\0"))
+  ) {
+    throw new Error(
+      "consulting.additionalReadOnlyDirectories must be a list of absolute directory paths.",
+    );
+  }
+  return [...new Set(value)];
+}
+
+/** Resolve current scoped grants for each run, following directory aliases and failing before process work. */
+export async function resolveAdditionalReadOnlyDirectories(
+  cwd: string,
+  homeDir?: string,
+  projectTrusted = true,
+): Promise<string[]> {
+  const config = loadConsultingConfig(cwd, homeDir, projectTrusted);
+  const directories = await Promise.all(
+    config.additionalReadOnlyDirectories.map(async (path) => {
+      try {
+        const canonical = await realpath(path);
+        if (!(await stat(canonical)).isDirectory()) throw new Error("Not a directory.");
+        await access(canonical, constants.R_OK | constants.X_OK);
+        return canonical;
+      } catch (error) {
+        throw new Error(
+          `Consulting additional read-only directory is missing, inaccessible, or not a directory: ${path}`,
+          { cause: error },
+        );
+      }
+    }),
+  );
+  return [...new Set(directories)];
+}

package/src/runtime.ts

@@ -17,6 +17,7 @@ type FooterState = "idle" | "checking" | "ready";
 /** Context needed to report availability and update the footer. */
 export type ConsultingRefreshContext = {
   ui: Pick<ExtensionContext["ui"], "notify" | "setStatus">;
+  isProjectTrusted?: ExtensionContext["isProjectTrusted"];
 };
 
 /** Session runtime for immutable availability and Conversation Handle state. */
@@ -85,7 +86,7 @@ export class ConsultingRuntime {
     if (context) this.#statusUi = context.ui;
     this.#stopSpinner();
     this.#setFooterState("idle");
-    const config = loadConsultingConfig(cwd, this.#homeDir);
+    const config = loadConsultingConfig(cwd, this.#homeDir, context?.isProjectTrusted?.() ?? true);
     if (!config.agentToolEnabled) {
       this.#deactivateTool();
       return;
@@ -141,6 +142,7 @@ export class ConsultingRuntime {
         adapter: this.adapter,
         availability,
         handles: this.handles,
+        homeDir: this.#homeDir,
       });
       this.#toolRegistered = true;
     }

package/src/settings.ts

@@ -1,6 +1,10 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { defineConfigSettings, registerSettings } from "@mrclrchtr/supi-core/settings";
-import { CONSULTING_CONFIG_SECTION, CONSULTING_DEFAULTS } from "./config.ts";
+import {
+  CONSULTING_CONFIG_SECTION,
+  CONSULTING_DEFAULTS,
+  validateAdditionalReadOnlyDirectories,
+} from "./config.ts";
 import type { ConsultingRuntime } from "./runtime.ts";
 
 /** Register the Consulting setting with an awaited availability refresh. */
@@ -21,6 +25,13 @@ export function registerConsultingSettings(
         label: "Consultation tool",
         description: "Enable consulting_run and its availability checks.",
       },
+      {
+        kind: "stringList" as const,
+        key: "additionalReadOnlyDirectories",
+        label: "Additional read-only directories",
+        description:
+          "Comma-separated absolute directories for every Consultation, including without Workspace Access. No shell expansion or globs; broad paths can expose sensitive files.",
+      },
     ],
     ...(homeDir ? { homeDir } : {}),
   });
@@ -28,9 +39,17 @@ export function registerConsultingSettings(
   registerSettings(pi, {
     ...fixedSettings,
     apply: async (request) => {
+      if (request.fieldKey === "additionalReadOnlyDirectories" && request.action.kind === "set") {
+        validateAdditionalReadOnlyDirectories(
+          request.action.value
+            .split(",")
+            .map((path) => path.trim())
+            .filter(Boolean),
+        );
+      }
       const result = await fixedSettings.apply(request);
       if (request.fieldKey === "agentToolEnabled") {
-        await runtime.refresh(request.cwd, request.ctx ? { ui: request.ctx.ui } : undefined);
+        await runtime.refresh(request.cwd, request.ctx);
       }
       return result;
     },

package/src/tool/consulting_run/execute.ts

@@ -5,6 +5,7 @@ import type {
   ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
 import type { ConsultingAgentAdapter, ConsultingAgentAvailability } from "../../agents/types.ts";
+import { resolveAdditionalReadOnlyDirectories } from "../../config.ts";
 import {
   appendHandleCreated,
   appendHandleRetired,
@@ -19,6 +20,8 @@ export interface ConsultingRunDependencies {
   adapter: ConsultingAgentAdapter;
   availability: ConsultingAgentAvailability;
   handles: ConversationHandleStore;
+  /** Override the user home for scoped configuration loading. */
+  homeDir?: string;
 }
 
 type ConsultingExecute = NonNullable<Parameters<ExtensionAPI["registerTool"]>[0]["execute"]>;
@@ -84,6 +87,11 @@ async function runNew(options: NewRunOptions): Promise<ReturnType<typeof buildCo
     model: input.new.model,
     canonicalWorkingDirectory: cwd,
     workspaceAccess,
+    additionalReadOnlyDirectories: await resolveAdditionalReadOnlyDirectories(
+      ctx.cwd,
+      dependencies.homeDir,
+      ctx.isProjectTrusted(),
+    ),
     signal,
     onProgress: progress,
     onWarning: (warning) => {
@@ -136,6 +144,11 @@ async function runContinue(
       model: record.model,
       canonicalWorkingDirectory: record.canonicalWorkingDirectory,
       workspaceAccess: record.workspaceAccess,
+      additionalReadOnlyDirectories: await resolveAdditionalReadOnlyDirectories(
+        ctx.cwd,
+        dependencies.homeDir,
+        ctx.isProjectTrusted(),
+      ),
       continuation: record.continuation,
       signal,
       onProgress: progress,

package/src/tool/consulting_run/guidance.ts

@@ -1,3 +1,3 @@
 /** Selection guidance for the dynamically activated consulting_run tool. */
 export const toolDescription =
-  "Consult a supported external agent for focused web research, design advice, workspace analysis, or an independent second opinion. Use direct tools for repository facts that do not need external analysis. Expose the current workspace only when the Consultation needs repository evidence.";
+  "Consult an external agent for web research, design advice, workspace analysis, or an independent second opinion. Use direct tools for repository facts. Expose the current workspace only when the Consultation needs repository evidence. Configured extra read-only directories apply to either workspace selection.";

package/src/tool/consulting_run/register.ts

@@ -12,6 +12,8 @@ export interface RegisterConsultingRunOptions {
   adapter: ConsultingAgentAdapter;
   availability: ConsultingAgentAvailability;
   handles: ConversationHandleStore;
+  /** Override the user home for scoped configuration loading. */
+  homeDir?: string;
 }
 
 /** Register consulting_run from one immutable availability snapshot. */
@@ -31,6 +33,7 @@ export function registerConsultingRunTool(options: RegisterConsultingRunOptions)
       adapter: options.adapter,
       availability: options.availability,
       handles: options.handles,
+      homeDir: options.homeDir,
     }),
   });
 }