privateer-agent 0.1.1 → 0.3.0

package/src/util/attachmentStore.ts

@@ -1,54 +1,39 @@
 import { mkdtempSync, writeFileSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join, extname } from "node:path";
-import type { Attachment, Modality } from "./images.ts";
 
-// One stored attachment: its bytes persisted to a stable scratch file, keyed by the
-// "#n" reference the user sees in the prompt.
+// Holds the decoded bytes of files the app sends down over the relay, in a private
+// scratch dir keyed by the "#n" reference the model sees, so the save_attachment tool
+// can write one back out to a real path on demand. Ported/adapted from tree-cli
+// (which persisted paste/drop bytes); here the source is inbound relay attachments.
+
 export interface StoredAttachment {
   n: number;
   path: string; // absolute scratch-file path holding the decoded bytes
   mediaType: string;
-  modality: Modality;
-  origin: string; // the token the user referenced (for display/debugging)
+  name: string; // original filename from the app
 }
 
-// Keeps the decoded bytes of every attachment seen this session in a private scratch
-// dir, keyed by its "[Kind #n]" reference, so the `save_attachment` tool can write one
-// back out to a real path on demand.
-//
-// This exists to close the macOS file-promise drop gap: the bytes we capture at
-// paste-time (in resolveAttachments) are the only durable copy — the terminal's
-// …/T/drop-XXXXXX/ file is a volatile stub that may already be gone or truncated by the
-// time the agent goes looking. We copy what we captured into a place we control, once,
-// instead of trusting that path twice.
 export class AttachmentStore {
   private dir: string | null = null;
   private readonly byN = new Map<number, StoredAttachment>();
+  private nextN = 1;
 
   private ensureDir(): string {
-    // mkdtemp gives a 0700 dir; created lazily so a session that never attaches
-    // anything leaves no temp files behind.
+    // mkdtemp gives a 0700 dir; created lazily so a session that never receives an
+    // attachment leaves no temp files behind.
     if (!this.dir) this.dir = mkdtempSync(join(tmpdir(), "privateer-att-"));
     return this.dir;
   }
 
-  // Persist an attachment's bytes to the scratch dir, keyed by n. Idempotent: the same
-  // n (a file referenced twice in a session) is written once and reused.
-  register(att: Attachment): StoredAttachment | undefined {
-    if (att.n == null) return undefined;
-    const existing = this.byN.get(att.n);
-    if (existing) return existing;
-    const file = join(this.ensureDir(), `att-${att.n}${extname(att.path)}`);
-    writeFileSync(file, Buffer.from(att.data, "base64"));
-    const stored: StoredAttachment = {
-      n: att.n,
-      path: file,
-      mediaType: att.mediaType,
-      modality: att.modality,
-      origin: att.path,
-    };
-    this.byN.set(att.n, stored);
+  // Persist an inbound attachment's bytes, assign it the next ref number, and return
+  // the stored record (its ref + scratch path).
+  register(file: { name: string; mediaType: string; base64: string }): StoredAttachment {
+    const n = this.nextN++;
+    const path = join(this.ensureDir(), `att-${n}${extname(file.name) || ""}`);
+    writeFileSync(path, Buffer.from(file.base64, "base64"));
+    const stored: StoredAttachment = { n, path, mediaType: file.mediaType, name: file.name };
+    this.byN.set(n, stored);
     return stored;
   }
 
@@ -56,13 +41,11 @@ export class AttachmentStore {
     return this.byN.get(n);
   }
 
-  // The reference numbers currently held, ascending — for a helpful error when the
-  // model asks for one that isn't there.
+  // Held reference numbers, ascending — for a helpful error when a missing one is asked for.
   refs(): number[] {
     return [...this.byN.keys()].sort((a, b) => a - b);
   }
 
-  // Remove the scratch dir (e.g. on session exit). Safe to call when nothing was stored.
   cleanup(): void {
     if (!this.dir) return;
     rmSync(this.dir, { recursive: true, force: true });

package/src/util/redact.ts

@@ -6,11 +6,22 @@
 const PLACEHOLDER = "«redacted»";
 
 // Common API-key shapes, masked even when we don't have the exact value on hand:
-// OpenAI `sk-…`, Anthropic `sk-ant-…`, OpenRouter `sk-or-v1-…`, and bare
-// "Bearer <token>" / "x-api-key: <token>" header fragments.
+// OpenAI `sk-…`, Anthropic `sk-ant-…`, OpenRouter `sk-or-v1-…`, Google `AIza…`,
+// xAI `xai-…`, Groq `gsk_…`, Z.ai/Zhipu `<32 hex>.<suffix>`, Cerebras `csk-…`,
+// Venice `vapi_…`, Fireworks `fw_…`, and bare
+// "Bearer <token>" / "x-api-key: <token>" / "x-goog-api-key: <token>" header
+// fragments. (Mistral and Together keys are prefix-less, so they rely on
+// exact-value masking and the header patterns.)
 const KEY_PATTERNS: RegExp[] = [
   /\bsk-(ant|or|proj|live|test)?-?[A-Za-z0-9_-]{16,}\b/g,
-  /\b(authorization|x-api-key)\b\s*[:=]\s*(bearer\s+)?["']?[A-Za-z0-9_\-.]{16,}["']?/gi,
+  /\bAIza[A-Za-z0-9_-]{20,}\b/g,
+  /\bxai-[A-Za-z0-9_-]{16,}\b/g,
+  /\bgsk_[A-Za-z0-9_-]{16,}\b/g,
+  /\bcsk-[A-Za-z0-9_-]{16,}\b/g,
+  /\bvapi_[A-Za-z0-9_-]{16,}\b/g,
+  /\bfw_[A-Za-z0-9_-]{16,}\b/g,
+  /\b[a-f0-9]{32}\.[A-Za-z0-9]{10,}\b/g,
+  /\b(authorization|x-api-key|x-goog-api-key)\b\s*[:=]\s*(bearer\s+)?["']?[A-Za-z0-9_\-.]{16,}["']?/gi,
 ];
 
 // Exact secret strings to mask, gathered from the resolved config + environment.
@@ -26,8 +37,27 @@ export function collectSecrets(providers?: Record<string, { apiKey?: string } |
     "OPENROUTER_API_KEY",
     "ANTHROPIC_API_KEY",
     "OPENAI_API_KEY",
+    "GOOGLE_GENERATIVE_AI_API_KEY",
+    "GEMINI_API_KEY",
+    "GOOGLE_API_KEY",
+    "XAI_API_KEY",
+    "GROQ_API_KEY",
+    "MISTRAL_API_KEY",
+    "ZAI_API_KEY",
+    "Z_AI_API_KEY",
+    "MOONSHOT_API_KEY",
+    "CEREBRAS_API_KEY",
+    "FIREWORKS_API_KEY",
+    "TOGETHER_API_KEY",
+    "TOGETHER_AI_API_KEY",
+    "DEEPSEEK_API_KEY",
+    "MINIMAX_API_KEY",
+    "DASHSCOPE_API_KEY",
+    "QWEN_API_KEY",
     "NEAR_AI_API_KEY",
     "NEARAI_API_KEY",
+    "TINFOIL_API_KEY",
+    "VENICE_API_KEY",
   ])
     add(process.env[k]);
   return [...out];

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2026 Patrick
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/src/agents/loader.ts

@@ -1,49 +0,0 @@
-import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-import { globalPaths, projectPaths } from "../config/paths.ts";
-import { walkFiles } from "../tools/walk.ts";
-import { parseFrontmatter } from "../commands/custom.ts";
-
-// A user-defined sub-agent loaded from .privateer/agents/<name>.md. The body is the
-// agent's instructions (system prompt); frontmatter narrows its tools and model.
-export interface AgentDefinition {
-  name: string;
-  description: string;
-  tools?: string[]; // tool names the agent may use (default: read/glob/grep)
-  model?: string; // optional "provider:model" override
-  prompt: string; // the agent's instructions
-  scope: "project" | "user";
-}
-
-function loadFromDir(dir: string, scope: "project" | "user"): AgentDefinition[] {
-  if (!existsSync(dir)) return [];
-  const out: AgentDefinition[] = [];
-  for (const rel of walkFiles(dir)) {
-    if (!rel.endsWith(".md")) continue;
-    const { meta, body } = parseFrontmatter(readFileSync(join(dir, rel), "utf8"));
-    out.push({
-      name: meta.name || rel.replace(/\.md$/, "").split("/").join(":"),
-      description: meta.description ?? `custom ${scope} sub-agent`,
-      tools: meta.tools
-        ?.split(",")
-        .map((s) => s.trim())
-        .filter(Boolean),
-      model: meta.model,
-      prompt: body.trim(),
-      scope,
-    });
-  }
-  return out;
-}
-
-// User (~/.privateer) then project (./.privateer) agents; project overrides user.
-export function loadAgents(cwd: string = process.cwd()): AgentDefinition[] {
-  const byName = new Map<string, AgentDefinition>();
-  for (const a of loadFromDir(globalPaths().agents, "user")) byName.set(a.name, a);
-  for (const a of loadFromDir(projectPaths(cwd).agents, "project")) byName.set(a.name, a);
-  return [...byName.values()].sort((a, b) => a.name.localeCompare(b.name));
-}
-
-export function findAgent(name: string, cwd: string = process.cwd()): AgentDefinition | undefined {
-  return loadAgents(cwd).find((a) => a.name === name);
-}

package/src/commands/custom.ts

@@ -1,75 +0,0 @@
-import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-import { globalPaths, projectPaths } from "../config/paths.ts";
-import { walkFiles } from "../tools/walk.ts";
-
-// A user-authored slash command loaded from a markdown file under
-// .privateer/commands/. The body is a prompt template; frontmatter is optional.
-export interface CustomCommand {
-  name: string; // file path minus .md, separators → ":" (e.g. "git/pr.md" → "git:pr")
-  description: string;
-  argumentHint?: string;
-  allowedTools?: string[];
-  model?: string;
-  body: string;
-  scope: "project" | "user";
-}
-
-// Minimal YAML-ish frontmatter: a leading `---` block of `key: value` lines.
-export function parseFrontmatter(raw: string): { meta: Record<string, string>; body: string } {
-  const lines = raw.split("\n");
-  if (lines[0]?.trim() !== "---") return { meta: {}, body: raw };
-  const meta: Record<string, string> = {};
-  let i = 1;
-  for (; i < lines.length; i++) {
-    if (lines[i].trim() === "---") {
-      i++;
-      break;
-    }
-    const m = lines[i].match(/^([A-Za-z0-9_-]+)\s*:\s*(.*)$/);
-    if (m) meta[m[1].toLowerCase()] = m[2].trim();
-  }
-  return { meta, body: lines.slice(i).join("\n").replace(/^\n+/, "") };
-}
-
-function loadFromDir(dir: string, scope: "project" | "user"): CustomCommand[] {
-  if (!existsSync(dir)) return [];
-  const out: CustomCommand[] = [];
-  for (const rel of walkFiles(dir)) {
-    if (!rel.endsWith(".md")) continue;
-    const { meta, body } = parseFrontmatter(readFileSync(join(dir, rel), "utf8"));
-    out.push({
-      name: rel.replace(/\.md$/, "").split("/").join(":"),
-      description: meta.description ?? `custom ${scope} command`,
-      argumentHint: meta["argument-hint"],
-      allowedTools: meta["allowed-tools"]
-        ?.split(",")
-        .map((s) => s.trim())
-        .filter(Boolean),
-      model: meta.model,
-      body: body.trim(),
-      scope,
-    });
-  }
-  return out;
-}
-
-// Load custom commands from user (~/.privateer) then project (./.privateer);
-// a project command overrides a user command of the same name.
-export function loadCustomCommands(cwd: string = process.cwd()): CustomCommand[] {
-  const byName = new Map<string, CustomCommand>();
-  for (const c of loadFromDir(globalPaths().commands, "user")) byName.set(c.name, c);
-  for (const c of loadFromDir(projectPaths(cwd).commands, "project")) byName.set(c.name, c);
-  return [...byName.values()].sort((a, b) => a.name.localeCompare(b.name));
-}
-
-// Expand a command body against its arguments: $1..$9 are positional words,
-// $ARGUMENTS and $@ are the full argument string.
-export function expandCommand(cmd: CustomCommand, argString: string): string {
-  const args = argString.trim();
-  const parts = args.length ? args.split(/\s+/) : [];
-  return cmd.body
-    .replace(/\$([1-9])/g, (_, d: string) => parts[Number(d) - 1] ?? "")
-    .replace(/\$ARGUMENTS\b/g, args)
-    .replace(/\$@/g, args);
-}