@openlines/opl-pi-sht 0.2.11 → 0.3.0

package/extensions/opl-footer/configure.ts

@@ -1,4 +1,4 @@
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { ExtensionContext, KeybindingsManager, Theme } from "@earendil-works/pi-coding-agent";
 import { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
 import { Key, matchesKey, SettingsList, truncateToWidth, type SettingItem } from "@earendil-works/pi-tui";
 
@@ -29,129 +29,171 @@ function segmentLabel(segment: string): string {
   return segment.replaceAll("_", " ");
 }
 
-export async function showFooterConfigurator(ctx: ExtensionContext, onSaved: () => void): Promise<void> {
-  if (ctx.mode !== "tui") {
-    ctx.ui.notify("/configure-opl requires TUI mode", "error");
-    return;
+// The configurator seam. opl-configurator owns the /configurator command and reads this
+// globalThis array lazily; the entry shape is duplicated by hand on both sides because
+// install.sh copies one extension directory at a time.
+export const CONFIGURATOR_REGISTRY_KEY = "__oplConfiguratorTabs";
+
+/** What the configurator shell hands to each tab's factory. */
+export interface ConfiguratorTabApi {
+  ctx: ExtensionContext;
+  tui: { requestRender(): void };
+  theme: Theme;
+  keybindings: KeybindingsManager;
+  done: (result: void) => void;
+}
+
+export interface ConfiguratorTabComponent {
+  render(width: number): string[];
+  invalidate?(): void;
+  handleInput?(data: string): void;
+}
+
+interface ConfiguratorTab {
+  id: string;
+  hotkey: string;
+  label: string;
+  create: (api: ConfiguratorTabApi) => ConfiguratorTabComponent;
+}
+
+/** Publish the footer's settings/reorder screen as a tab, once per extension load. */
+export function registerFooterConfiguratorTab(onSaved: (ctx: ExtensionContext) => void): void {
+  const tab: ConfiguratorTab = {
+    id: "opl-footer",
+    hotkey: "f",
+    label: "Footer",
+    create: (api) => createFooterComponent(api, onSaved),
+  };
+
+  const holder = globalThis as Record<string, unknown>;
+  const registry = holder[CONFIGURATOR_REGISTRY_KEY];
+  if (Array.isArray(registry)) {
+    if (!registry.some((entry) => entry?.id === "opl-footer")) registry.push(tab);
+  } else {
+    holder[CONFIGURATOR_REGISTRY_KEY] = [tab];
   }
+}
 
+function createFooterComponent(
+  api: ConfiguratorTabApi,
+  onSaved: (ctx: ExtensionContext) => void,
+): ConfiguratorTabComponent {
+  const { ctx, tui, theme, done } = api;
   let config = loadUserConfig() ?? {};
-  await ctx.ui.custom<void>((tui, theme, _keybindings, done) => {
-    let activeTab = 0;
-    let view: "settings" | "reorder" = "settings";
-    let reorderIndex = 0;
-    let settingsLists: SettingsList[] = [];
-
-    const persist = (next: typeof config, selectedId?: string): boolean => {
-      try {
-        saveUserConfig(next);
-        config = next;
-        settingsLists = createSettingsLists();
-        if (selectedId) restoreSelectedItem(settingsLists, activeTab, selectedId);
-        onSaved();
-        return true;
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        ctx.ui.notify(`Could not save footer config: ${message}`, "error");
-        done(undefined);
-        return false;
-      }
-    };
-
-    const save = (id: string, value: string) => {
-      const [key, segment, kind] = id.split(":") as [FooterLayoutKey, typeof CONFIGURABLE_SEGMENTS[number], string];
-      const next = kind === "separator"
-        ? setSegmentSeparator(config, key, segment, value === "shown")
-        : setLayoutSegment(config, key, segment, value === "shown");
-      persist(next, id);
-    };
-
-    const createSettingsLists = (): SettingsList[] => FOOTER_LAYOUT_KEYS.map((key) => {
-      const layout = getLayoutSegments(config, key);
-      const items: SettingItem[] = CONFIGURABLE_SEGMENTS.flatMap((segment) => {
-        const index = layout.indexOf(segment);
-        return [
-          {
-            id: `${key}:${segment}:segment`,
-            label: segmentLabel(segment),
-            currentValue: index === -1 ? "hidden" : "shown",
-            values: ["shown", "hidden"],
-          },
-          {
-            id: `${key}:${segment}:separator`,
-            label: `${segmentLabel(segment)} separator`,
-            currentValue: hasSegmentSeparator(config, key, segment) ? "shown" : "hidden",
-            values: ["shown", "hidden"],
-          },
-        ];
-      });
-      return new SettingsList(items, 15, getSettingsListTheme(), save, () => done(undefined));
-    });
+  let activeTab = 0;
+  let view: "settings" | "reorder" = "settings";
+  let reorderIndex = 0;
+  let settingsLists: SettingsList[] = [];
 
-    const visibleSegments = (): typeof CONFIGURABLE_SEGMENTS[number][] =>
-      getLayoutSegments(config, FOOTER_LAYOUT_KEYS[activeTab]!).filter((segment) => CONFIGURABLE_SEGMENTS.includes(segment));
+  const persist = (next: typeof config, selectedId?: string): boolean => {
+    try {
+      saveUserConfig(next);
+      config = next;
+      settingsLists = createSettingsLists();
+      if (selectedId) restoreSelectedItem(settingsLists, activeTab, selectedId);
+      onSaved(ctx);
+      return true;
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      ctx.ui.notify(`Could not save footer config: ${message}`, "error");
+      done(undefined);
+      return false;
+    }
+  };
 
-    settingsLists = createSettingsLists();
+  const save = (id: string, value: string) => {
+    const [key, segment, kind] = id.split(":") as [FooterLayoutKey, typeof CONFIGURABLE_SEGMENTS[number], string];
+    const next = kind === "separator"
+      ? setSegmentSeparator(config, key, segment, value === "shown")
+      : setLayoutSegment(config, key, segment, value === "shown");
+    persist(next, id);
+  };
 
-    return {
-      render(width: number) {
-        const tabs = FOOTER_LAYOUT_KEYS.map((key, index) =>
-          theme.fg(index === activeTab ? "accent" : "dim", `[${LAYOUT_LABELS[key]}]`),
-        ).join(" ");
-        const header = [
-          truncateToWidth(theme.bold("Configure OPL Footer"), width),
-          truncateToWidth(tabs, width),
-        ];
-        if (view === "settings") {
-          return [
-            ...header,
-            truncateToWidth(theme.fg("dim", "←/→ switch layout · r reorder · Changes apply immediately"), width),
-            ...settingsLists[activeTab]!.render(width),
-          ];
-        }
+  const createSettingsLists = (): SettingsList[] => FOOTER_LAYOUT_KEYS.map((key) => {
+    const layout = getLayoutSegments(config, key);
+    const items: SettingItem[] = CONFIGURABLE_SEGMENTS.flatMap((segment) => {
+      const index = layout.indexOf(segment);
+      return [
+        {
+          id: `${key}:${segment}:segment`,
+          label: segmentLabel(segment),
+          currentValue: index === -1 ? "hidden" : "shown",
+          values: ["shown", "hidden"],
+        },
+        {
+          id: `${key}:${segment}:separator`,
+          label: `${segmentLabel(segment)} separator`,
+          currentValue: hasSegmentSeparator(config, key, segment) ? "shown" : "hidden",
+          values: ["shown", "hidden"],
+        },
+      ];
+    });
+    return new SettingsList(items, 15, getSettingsListTheme(), save, () => done(undefined));
+  });
 
-        const segments = visibleSegments();
-        reorderIndex = Math.min(reorderIndex, Math.max(0, segments.length - 1));
-        const rows = segments.length === 0
-          ? [theme.fg("dim", "No visible standard segments.")]
-          : segments.map((segment, index) => {
-            const text = `${index === reorderIndex ? "›" : " "} ${segmentLabel(segment)}${hasSegmentSeparator(config, FOOTER_LAYOUT_KEYS[activeTab]!, segment) ? " + separator" : ""}`;
-            return index === reorderIndex ? theme.fg("accent", text) : text;
-          });
+  const visibleSegments = (): typeof CONFIGURABLE_SEGMENTS[number][] =>
+    getLayoutSegments(config, FOOTER_LAYOUT_KEYS[activeTab]!).filter((segment) => CONFIGURABLE_SEGMENTS.includes(segment));
+
+  settingsLists = createSettingsLists();
+
+  return {
+    render(width: number) {
+      const tabs = FOOTER_LAYOUT_KEYS.map((key, index) =>
+        theme.fg(index === activeTab ? "accent" : "dim", `[${LAYOUT_LABELS[key]}]`),
+      ).join(" ");
+      const header = [
+        truncateToWidth(theme.bold("Configure OPL Footer"), width),
+        truncateToWidth(tabs, width),
+      ];
+      if (view === "settings") {
         return [
           ...header,
-          truncateToWidth(theme.fg("dim", "↑/↓ select · ,/. move · r settings · esc close"), width),
-          ...rows.map((row) => truncateToWidth(row, width)),
+          truncateToWidth(theme.fg("dim", "←/→ switch layout · r reorder · Changes apply immediately"), width),
+          ...settingsLists[activeTab]!.render(width),
         ];
-      },
-      invalidate() { settingsLists.forEach((list) => list.invalidate()); },
-      handleInput(data: string) {
-        if (matchesKey(data, Key.left)) {
-          activeTab = nextTabIndex(activeTab, "left", FOOTER_LAYOUT_KEYS.length);
-          reorderIndex = 0;
-        } else if (matchesKey(data, Key.right)) {
-          activeTab = nextTabIndex(activeTab, "right", FOOTER_LAYOUT_KEYS.length);
-          reorderIndex = 0;
-        } else if (view === "reorder") {
-          const segments = visibleSegments();
-          if (data === "r") view = "settings";
-          else if (matchesKey(data, Key.escape)) done(undefined);
-          else if (matchesKey(data, Key.up) && segments.length > 0) reorderIndex = (reorderIndex + segments.length - 1) % segments.length;
-          else if (matchesKey(data, Key.down) && segments.length > 0) reorderIndex = (reorderIndex + 1) % segments.length;
-          else if ((data === "," || data === ".") && segments[reorderIndex]) {
-            const next = moveLayoutSegment(config, FOOTER_LAYOUT_KEYS[activeTab]!, segments[reorderIndex]!, data === "," ? "up" : "down");
-            if (next !== config && persist(next)) {
-              reorderIndex = data === "," ? Math.max(0, reorderIndex - 1) : Math.min(segments.length - 1, reorderIndex + 1);
-            }
+      }
+
+      const segments = visibleSegments();
+      reorderIndex = Math.min(reorderIndex, Math.max(0, segments.length - 1));
+      const rows = segments.length === 0
+        ? [theme.fg("dim", "No visible standard segments.")]
+        : segments.map((segment, index) => {
+          const text = `${index === reorderIndex ? "›" : " "} ${segmentLabel(segment)}${hasSegmentSeparator(config, FOOTER_LAYOUT_KEYS[activeTab]!, segment) ? " + separator" : ""}`;
+          return index === reorderIndex ? theme.fg("accent", text) : text;
+        });
+      return [
+        ...header,
+        truncateToWidth(theme.fg("dim", "↑/↓ select · ,/. move · r settings · esc close"), width),
+        ...rows.map((row) => truncateToWidth(row, width)),
+      ];
+    },
+    invalidate() { settingsLists.forEach((list) => list.invalidate()); },
+    handleInput(data: string) {
+      if (matchesKey(data, Key.left)) {
+        activeTab = nextTabIndex(activeTab, "left", FOOTER_LAYOUT_KEYS.length);
+        reorderIndex = 0;
+      } else if (matchesKey(data, Key.right)) {
+        activeTab = nextTabIndex(activeTab, "right", FOOTER_LAYOUT_KEYS.length);
+        reorderIndex = 0;
+      } else if (view === "reorder") {
+        const segments = visibleSegments();
+        if (data === "r") view = "settings";
+        else if (matchesKey(data, Key.escape)) done(undefined);
+        else if (matchesKey(data, Key.up) && segments.length > 0) reorderIndex = (reorderIndex + segments.length - 1) % segments.length;
+        else if (matchesKey(data, Key.down) && segments.length > 0) reorderIndex = (reorderIndex + 1) % segments.length;
+        else if ((data === "," || data === ".") && segments[reorderIndex]) {
+          const next = moveLayoutSegment(config, FOOTER_LAYOUT_KEYS[activeTab]!, segments[reorderIndex]!, data === "," ? "up" : "down");
+          if (next !== config && persist(next)) {
+            reorderIndex = data === "," ? Math.max(0, reorderIndex - 1) : Math.min(segments.length - 1, reorderIndex + 1);
           }
-        } else if (data === "r") {
-          view = "reorder";
-          reorderIndex = 0;
-        } else {
-          settingsLists[activeTab]!.handleInput?.(data);
         }
-        tui.requestRender();
-      },
-    };
-  });
-}
+      } else if (data === "r") {
+        view = "reorder";
+        reorderIndex = 0;
+      } else {
+        settingsLists[activeTab]!.handleInput?.(data);
+      }
+      tui.requestRender();
+    },
+  };
+}

package/extensions/opl-footer/git-status.ts

@@ -78,9 +78,66 @@ function parseGitStatusOutput(output: string): { staged: number; unstaged: numbe
   return { staged, unstaged, untracked };
 }
 
+// BEGIN SHARED GIT GUARD
+// A repository is attacker-chosen data: its local config, `.gitattributes` and system
+// config can name programs that git runs while answering what looks like a read-only query.
+// Measured on git 2.54: `git diff HEAD` executes a declared `[diff "x"] textconv` driver,
+// while `--name-only`, `status --porcelain`, `ls-files` and `rev-parse` do not. Every call
+// still goes through this guard so a future content-diff call cannot reintroduce the
+// execution path. Duplicated per extension because install.sh installs one directory at a
+// time; tests/net-guard-parity.test.mjs fails if the copies drift.
+const SAFE_GIT_GLOBAL_ARGS = [
+  "--no-pager",
+  "-c",
+  "core.fsmonitor=false",
+  "-c",
+  "core.hooksPath=",
+  "-c",
+  "protocol.ext.allow=never",
+  "-c",
+  "credential.helper=",
+];
+
+/** Refuse external content handlers. Diff-family subcommands only: plumbing rejects them. */
+const SAFE_GIT_DIFF_FLAGS = ["--no-ext-diff", "--no-textconv"];
+const GIT_DIFF_COMMANDS = new Set(["diff", "log", "show", "stash", "range-diff", "format-patch"]);
+
+const SAFE_GIT_ENV: Record<string, string> = {
+  // /etc/gitconfig and the user's own config can name helpers; a repo probe must not read them.
+  GIT_CONFIG_NOSYSTEM: "1",
+  GIT_ATTR_NOSYSTEM: "1",
+  GIT_PAGER: "cat",
+  // A credential prompt would hang the caller instead of failing fast.
+  GIT_TERMINAL_PROMPT: "0",
+  GIT_ASKPASS: "",
+  SSH_ASKPASS: "",
+  // Read-only plumbing must not create or wait on index.lock.
+  GIT_OPTIONAL_LOCKS: "0",
+};
+
+export function safeGitInvocation(args: string[]): string[] {
+  const [subcommand, ...rest] = args;
+  const diffFlags = subcommand && GIT_DIFF_COMMANDS.has(subcommand) ? SAFE_GIT_DIFF_FLAGS : [];
+  // A missing subcommand must not reach execFileSync/spawn as an undefined argv slot.
+  return subcommand
+    ? [...SAFE_GIT_GLOBAL_ARGS, subcommand, ...diffFlags, ...rest]
+    : [...SAFE_GIT_GLOBAL_ARGS, ...rest];
+}
+
+export function gitGuardEnv(base: Record<string, string | undefined> = process.env): Record<string, string> {
+  const env: Record<string, string> = {};
+  for (const [key, value] of Object.entries(base)) {
+    if (typeof value === "string") env[key] = value;
+  }
+  return { ...env, ...SAFE_GIT_ENV };
+}
+// END SHARED GIT GUARD
+
 function runGit(args: string[], timeoutMs = 200): Promise<string | null> {
+  // Porcelain/name-only only; the guard above refuses patch content.
   return new Promise((resolve) => {
-    const proc = spawn("git", args, {
+    const proc = spawn("git", safeGitInvocation(args), {
+      env: gitGuardEnv(),
       stdio: ["ignore", "pipe", "pipe"],
     });
 

package/extensions/opl-footer/icons.ts

@@ -3,6 +3,7 @@ export interface IconSet {
   folder: string;
   branch: string;
   git: string;
+  compress: string;
   separator: string;
 }
 
@@ -12,6 +13,7 @@ export const NERD_ICONS: IconSet = {
   folder: "\uF115",     // nf-fa-folder_open
   branch: "\uF126",     // nf-fa-code_fork
   git: "\uF1D3",        // nf-fa-git
+  compress: "\u{F05C4}", // nf-md-zip_box
   separator: "|",
 };
 
@@ -21,6 +23,7 @@ export const ASCII_ICONS: IconSet = {
   folder: "📂",
   branch: "⎇",
   git: "⎇",
+  compress: "📦",
   separator: "|",
 };