resources

2026-02-24 16:44:22 +00:00
parent d6ffe43a11
commit 05f0d0e8f7
39 changed files with 1385 additions and 1057 deletions
@@ -1,12 +1,13 @@
 import { join, relative } from "path";
-import { readdirSync, existsSync, mkdirSync } from "node:fs";
+import { readdirSync, existsSync, mkdirSync, writeFileSync, readFileSync } from "node:fs";
 import type { Subprocess } from "bun";
 import type { PiEvent, MessageCost } from "./types";
 import { readApiKeys } from "../server-settings/pi-mono";
 import { readSearxngConfig } from "../server-settings/searxng";
-import { PI_CONFIG_DIR, getGlobalSkillsDir, getUserSkillsDir, getGlobalExtensionsDir, getUserExtensionsDir, getGlobalToolsDir, getUserToolsDir } from "../../data-path";
+import { PI_CONFIG_DIR, DATA_PATH, getGlobalSkillsDir, getUserSkillsDir, getGlobalExtensionsDir, getUserExtensionsDir, getGlobalToolsDir, getUserToolsDir, getNativeResourcesDir, getGlobalResourcesDir } from "../../data-path";
 import { ensureDockerContainer } from "../terminal/websocket";
 import { logger } from "./logger";
+import { parseFrontmatter } from "../skills/skills";

 export type PiEventHandler = (event: PiEvent) => void;

@@ -52,6 +53,106 @@ function collectExtensionFlags(email: string, containerPaths?: PathOverrides): s
  return flags;
 }

+function generateResourceSkill(outputDir: string): string | null {
+  const nativeDir = getNativeResourcesDir();
+  const globalDir = getGlobalResourcesDir();
+
+  // Collect all resource dirs (global overrides native)
+  const resourceDirs = new Map<string, string>();
+  for (const dir of [nativeDir, globalDir]) {
+    if (!existsSync(dir)) continue;
+    for (const entry of readdirSync(dir, { withFileTypes: true })) {
+      if (!entry.isDirectory()) continue;
+      if (existsSync(join(dir, entry.name, 'RESOURCE.md'))) {
+        resourceDirs.set(entry.name, dir);
+      }
+    }
+  }
+
+  if (resourceDirs.size === 0) return null;
+
+  const sections: string[] = [];
+  for (const [name, baseDir] of resourceDirs) {
+    const resourceMd = join(baseDir, name, 'RESOURCE.md');
+    let mdContent = '';
+    try { mdContent = readFileSync(resourceMd, 'utf-8'); } catch { continue; }
+    const { frontmatter } = parseFrontmatter(mdContent);
+
+    // Merge native + global config
+    let nativeConfig: Record<string, string> = {};
+    let globalConfig: Record<string, string> = {};
+    try { nativeConfig = JSON.parse(readFileSync(join(nativeDir, name, 'config.json'), 'utf-8')); } catch {}
+    try { globalConfig = JSON.parse(readFileSync(join(globalDir, name, 'config.json'), 'utf-8')); } catch {}
+
+    const config: Record<string, string> = {};
+    for (const key of Object.keys(nativeConfig)) config[key] = globalConfig[key] ?? nativeConfig[key]!;
+    for (const key of Object.keys(globalConfig)) if (!(key in config)) config[key] = globalConfig[key]!;
+
+    const hasValues = Object.values(config).some((v) => v !== '');
+    const configLines = Object.entries(config)
+      .filter(([, v]) => v)
+      .map(([k, v]) => /key|secret|password|token/i.test(k) ? `- **${k}**: (configured)` : `- **${k}**: ${v}`);
+
+    sections.push([
+      `### ${frontmatter.name || name}`,
+      hasValues ? 'Status: **configured**' : 'Status: not configured',
+      ...configLines,
+    ].join('\n'));
+  }
+
+  const skillContent = [
+    '---',
+    'name: Available Resources',
+    'description: External services and APIs configured on this Officer instance',
+    '---',
+    '',
+    'These are external services available to you. Use their configured URLs directly via HTTP requests.',
+    'Do NOT try to install local alternatives (like tesseract, whisper, etc.) — use the configured HTTP APIs instead.',
+    '',
+    ...sections,
+  ].join('\n');
+
+  const skillDir = join(outputDir, '.generated', 'available-resources');
+  mkdirSync(skillDir, { recursive: true });
+  writeFileSync(join(skillDir, 'SKILL.md'), skillContent, 'utf-8');
+  return skillDir;
+}
+
+function buildResourcesEnv(): string {
+  const nativeDir = getNativeResourcesDir();
+  const globalDir = getGlobalResourcesDir();
+
+  const resourceDirs = new Map<string, string>();
+  for (const dir of [nativeDir, globalDir]) {
+    if (!existsSync(dir)) continue;
+    for (const entry of readdirSync(dir, { withFileTypes: true })) {
+      if (!entry.isDirectory()) continue;
+      if (existsSync(join(dir, entry.name, 'RESOURCE.md')) || existsSync(join(dir, entry.name, 'config.json'))) {
+        resourceDirs.set(entry.name, dir);
+      }
+    }
+  }
+
+  const result: Record<string, Record<string, string>> = {};
+  for (const [name] of resourceDirs) {
+    let nativeConfig: Record<string, string> = {};
+    let globalConfig: Record<string, string> = {};
+    try { nativeConfig = JSON.parse(readFileSync(join(nativeDir, name, 'config.json'), 'utf-8')); } catch {}
+    try { globalConfig = JSON.parse(readFileSync(join(globalDir, name, 'config.json'), 'utf-8')); } catch {}
+
+    const config: Record<string, string> = {};
+    for (const key of Object.keys(nativeConfig)) config[key] = globalConfig[key] ?? nativeConfig[key]!;
+    for (const key of Object.keys(globalConfig)) if (!(key in config)) config[key] = globalConfig[key]!;
+
+    // Only include resources that have at least one non-empty value
+    if (Object.values(config).some((v) => v !== '')) {
+      result[name] = config;
+    }
+  }
+
+  return JSON.stringify(result);
+}
+
 type SandboxOptions = {
  userId: number;
  username: string;
@@ -87,19 +188,27 @@ export async function spawnPi(
      user: '/officer/user/extensions',
    });

+    // Generate resource context skill (host-side, mounted into container)
+    const resourceSkillHost = generateResourceSkill(DATA_PATH);
+    const resourceSkillFlags = resourceSkillHost ? ['--skill', '/officer/generated/available-resources'] : [];
+
    const piArgs = [
      'pi', '--mode', 'rpc',
      '--no-skills', '--no-prompt-templates', '--no-themes',
      ...skillFlags,
      ...extensionFlags,
+      ...resourceSkillFlags,
    ];
    if (model) piArgs.push('--model', model);

+    const resourcesEnv = buildResourcesEnv();
+
    const envFlags = [
      '-e', `PI_CODING_AGENT_DIR=${containerPiConfig}`,
      '-e', `HOME=${containerHome}`,
      '-e', `PI_TOOLS_DIRS=/officer/tools:/officer/user/tools`,
      '-e', `PI_SEARXNG_URL=${searxng.url}`,
+      '-e', `OFFICER_RESOURCES=${resourcesEnv}`,
    ];
    for (const [key, value] of Object.entries(storedKeys)) {
      if (value?.trim()) envFlags.push('-e', `${key}=${value.trim()}`);
@@ -130,7 +239,12 @@ export async function spawnPi(
    const searxng = await readSearxngConfig();
    const skillFlags = collectSkillFlags(email);
    const extensionFlags = collectExtensionFlags(email);
-    const args = ['pi', '--mode', 'rpc', '--no-skills', '--no-prompt-templates', '--no-themes', ...skillFlags, ...extensionFlags];
+
+    // Generate resource context skill
+    const resourceSkillDir = generateResourceSkill(DATA_PATH);
+    const resourceSkillFlags = resourceSkillDir ? ['--skill', resourceSkillDir] : [];
+
+    const args = ['pi', '--mode', 'rpc', '--no-skills', '--no-prompt-templates', '--no-themes', ...skillFlags, ...extensionFlags, ...resourceSkillFlags];
    if (model) args.push('--model', model);

    if (!existsSync(cwd)) {
@@ -144,7 +258,7 @@ export async function spawnPi(
      stdin: 'pipe',
      stdout: 'pipe',
      stderr: 'pipe',
-      env: { ...process.env, ...storedKeys, PI_CODING_AGENT_DIR: PI_CONFIG_DIR, PI_TOOLS_DIRS: toolsDirs, PI_SEARXNG_URL: searxng.url },
+      env: { ...process.env, ...storedKeys, PI_CODING_AGENT_DIR: PI_CONFIG_DIR, PI_TOOLS_DIRS: toolsDirs, PI_SEARXNG_URL: searxng.url, OFFICER_RESOURCES: buildResourcesEnv() },
    });

    logger.info('Spawned Pi locally', {