agentikit 0.0.7 → 0.0.8

package/src/ripgrep.ts

@@ -1,315 +1,3 @@
-import { spawnSync } from "node:child_process"
-import fs from "node:fs"
-import path from "node:path"
-
-// ── ripgrep Resolution ──────────────────────────────────────────────────────
-
-const IS_WINDOWS = process.platform === "win32"
-const RG_BINARY = IS_WINDOWS ? "rg.exe" : "rg"
-
-function canExecute(filePath: string): boolean {
-  if (!fs.existsSync(filePath)) return false
-  if (IS_WINDOWS) return true
-  try {
-    fs.accessSync(filePath, fs.constants.X_OK)
-    return true
-  } catch {
-    return false
-  }
-}
-
-function resolveFromPath(): string | null {
-  const rawPath = process.env.PATH
-  if (!rawPath) return null
-
-  const pathEntries = rawPath.split(path.delimiter).filter(Boolean)
-
-  if (IS_WINDOWS) {
-    const pathext = (process.env.PATHEXT || ".EXE;.CMD;.BAT;.COM")
-      .split(";")
-      .filter(Boolean)
-      .map((ext) => ext.toLowerCase())
-
-    for (const entry of pathEntries) {
-      const directCandidate = path.join(entry, "rg")
-      if (canExecute(directCandidate)) return directCandidate
-
-      for (const ext of pathext) {
-        const candidate = path.join(entry, `rg${ext}`)
-        if (canExecute(candidate)) return candidate
-      }
-    }
-    return null
-  }
-
-  for (const entry of pathEntries) {
-    const candidate = path.join(entry, "rg")
-    if (canExecute(candidate)) return candidate
-  }
-
-  return null
-}
-
-/**
- * Resolve the path to a usable ripgrep binary.
- * Checks in order:
- *   1. stashDir/bin/rg
- *   2. system PATH (rg)
- * Returns null if ripgrep is not available.
- */
-export function resolveRg(stashDir?: string): string | null {
-  // Check stash bin directory first
-  if (stashDir) {
-    const stashRg = path.join(stashDir, "bin", RG_BINARY)
-    if (canExecute(stashRg)) return stashRg
-  }
-
-  return resolveFromPath()
-}
-
-/**
- * Check if ripgrep is available (either in stash/bin or system PATH).
- */
-export function isRgAvailable(stashDir?: string): boolean {
-  return resolveRg(stashDir) !== null
-}
-
-// ── ripgrep Candidate Filtering ─────────────────────────────────────────────
-
-export interface RgCandidateResult {
-  matchedFiles: string[]
-  usedRg: boolean
-}
-
-/**
- * Use ripgrep to find .stash.json files that match query tokens.
- * Returns paths to matching .stash.json files.
- *
- * If ripgrep is not available or the query is empty, returns null
- * to signal that the caller should skip pre-filtering.
- */
-export function rgFilterCandidates(
-  query: string,
-  searchDir: string,
-  stashDir?: string,
-): RgCandidateResult | null {
-  if (!query.trim()) return null
-
-  const rgPath = resolveRg(stashDir)
-  if (!rgPath) return null
-
-  // Tokenize the query into an OR pattern for ripgrep
-  const tokens = query
-    .toLowerCase()
-    .replace(/[^a-z0-9\s]/g, " ")
-    .split(/\s+/)
-    .filter((t) => t.length > 1)
-
-  if (tokens.length === 0) return null
-
-  const pattern = tokens.join("|")
-
-  const result = spawnSync(rgPath, [
-    "-i",                        // case insensitive
-    "-l",                        // files-with-matches only
-    "--hidden",                  // include hidden files such as .stash.json
-    "--no-ignore",               // include ignored files to ensure metadata is searchable
-    "--glob", ".stash.json",     // only search .stash.json files
-    pattern,
-    searchDir,
-  ], {
-    encoding: "utf8",
-    timeout: 10_000,
-  })
-
-  if (result.status !== 0 && result.status !== 1) {
-    // rg exit code 1 = no matches (normal), anything else = error
-    return null
-  }
-
-  const files = (result.stdout || "")
-    .trim()
-    .split(/\r?\n/)
-    .filter((f) => f.length > 0)
-
-  return { matchedFiles: files, usedRg: true }
-}
-
-// ── ripgrep Installation ────────────────────────────────────────────────────
-
-/**
- * Platform and architecture detection for ripgrep binary downloads.
- */
-function getRgPlatformTarget(): { platform: string; arch: string; ext: string } | null {
-  const platform = process.platform
-  const arch = process.arch
-
-  if (platform === "linux" && arch === "x64") {
-    return { platform: "x86_64-unknown-linux-musl", arch: "x64", ext: ".tar.gz" }
-  }
-  if (platform === "linux" && arch === "arm64") {
-    return { platform: "aarch64-unknown-linux-gnu", arch: "arm64", ext: ".tar.gz" }
-  }
-  if (platform === "darwin" && arch === "x64") {
-    return { platform: "x86_64-apple-darwin", arch: "x64", ext: ".tar.gz" }
-  }
-  if (platform === "darwin" && arch === "arm64") {
-    return { platform: "aarch64-apple-darwin", arch: "arm64", ext: ".tar.gz" }
-  }
-  if (platform === "win32" && arch === "x64") {
-    return { platform: "x86_64-pc-windows-msvc", arch: "x64", ext: ".zip" }
-  }
-
-  return null
-}
-
-const RG_VERSION = "14.1.1"
-
-export interface EnsureRgResult {
-  rgPath: string
-  installed: boolean
-  version: string
-}
-
-/**
- * Ensure ripgrep is available. If not found on PATH or in stash/bin,
- * download and install it to stash/bin.
- *
- * Returns the path to the ripgrep binary and whether it was newly installed.
- */
-export function ensureRg(stashDir: string): EnsureRgResult {
-  // Already available?
-  const existing = resolveRg(stashDir)
-  if (existing) {
-    return { rgPath: existing, installed: false, version: getRgVersion(existing) }
-  }
-
-  // Determine platform
-  const target = getRgPlatformTarget()
-  if (!target) {
-    throw new Error(
-      `Unsupported platform for ripgrep auto-install: ${process.platform}/${process.arch}. ` +
-      `Install ripgrep manually: https://github.com/BurntSushi/ripgrep#installation`
-    )
-  }
-
-  const binDir = path.join(stashDir, "bin")
-  if (!fs.existsSync(binDir)) {
-    fs.mkdirSync(binDir, { recursive: true })
-  }
-
-  const archiveName = `ripgrep-${RG_VERSION}-${target.platform}`
-  const url = `https://github.com/BurntSushi/ripgrep/releases/download/${RG_VERSION}/${archiveName}${target.ext}`
-  const destBinary = path.join(binDir, RG_BINARY)
-
-  if (target.ext === ".tar.gz") {
-    downloadAndExtractTarGz(url, archiveName, destBinary)
-  } else {
-    downloadAndExtractZip(url, archiveName, destBinary)
-  }
-
-  // Make executable
-  if (!IS_WINDOWS) {
-    fs.chmodSync(destBinary, 0o755)
-  }
-
-  return { rgPath: destBinary, installed: true, version: RG_VERSION }
-}
-
-function downloadAndExtractTarGz(url: string, archiveName: string, destBinary: string): void {
-  const destDir = path.dirname(destBinary)
-  const tmpTarGz = path.join(destDir, "rg-download.tar.gz")
-
-  try {
-    // Download archive to a temporary file without using a shell
-    const curlResult = spawnSync(
-      "curl",
-      ["-fsSL", "-o", tmpTarGz, url],
-      {
-        encoding: "utf8",
-        timeout: 60_000,
-      }
-    )
-
-    if (curlResult.status !== 0) {
-      const err = curlResult.stderr?.trim() || curlResult.error?.message || "unknown error"
-      throw new Error(`Failed to download ripgrep from ${url}: ${err}`)
-    }
-
-    // Extract the specific binary from the archive into destDir
-    const tarResult = spawnSync(
-      "tar",
-      [
-        "xzf",
-        tmpTarGz,
-        "--strip-components=1",
-        "-C",
-        destDir,
-        `${archiveName}/rg`,
-      ],
-      {
-        encoding: "utf8",
-        timeout: 60_000,
-      }
-    )
-
-    if (tarResult.status !== 0) {
-      const err = tarResult.stderr?.trim() || tarResult.error?.message || "unknown error"
-      throw new Error(`Failed to extract ripgrep from ${url}: ${err}`)
-    }
-
-    if (!fs.existsSync(destBinary)) {
-      throw new Error(`ripgrep binary not found at ${destBinary} after extraction`)
-    }
-  } finally {
-    // Best-effort cleanup of temporary archive
-    try {
-      if (fs.existsSync(tmpTarGz)) {
-        fs.unlinkSync(tmpTarGz)
-      }
-    } catch {
-      // ignore cleanup errors
-    }
-  }
-}
-
-function downloadAndExtractZip(url: string, archiveName: string, destBinary: string): void {
-  const destDir = path.dirname(destBinary)
-  const tmpZip = path.join(destDir, "rg-download.zip")
-  const expandedDir = path.join(destDir, archiveName)
-  try {
-    // Download
-    const dlResult = spawnSync("curl", ["-fsSL", "-o", tmpZip, url], {
-      encoding: "utf8",
-      timeout: 60_000,
-    })
-    if (dlResult.status !== 0) {
-      throw new Error(dlResult.stderr?.trim() || "download failed")
-    }
-
-    // Extract just the rg.exe
-    const extractResult = spawnSync("powershell", [
-      "-Command",
-      `Expand-Archive -Path "${tmpZip}" -DestinationPath "${destDir}" -Force; ` +
-      `Move-Item -Force "${path.join(destDir, archiveName, "rg.exe")}" "${destBinary}"`,
-    ], {
-      encoding: "utf8",
-      timeout: 60_000,
-    })
-    if (extractResult.status !== 0) {
-      throw new Error(extractResult.stderr?.trim() || "extraction failed")
-    }
-  } finally {
-    if (fs.existsSync(tmpZip)) fs.unlinkSync(tmpZip)
-    if (fs.existsSync(expandedDir)) fs.rmSync(expandedDir, { recursive: true, force: true })
-  }
-}
-
-function getRgVersion(rgPath: string): string {
-  const result = spawnSync(rgPath, ["--version"], { encoding: "utf8", timeout: 5_000 })
-  if (result.status === 0 && result.stdout) {
-    const match = result.stdout.match(/ripgrep\s+([\d.]+)/)
-    return match ? match[1] : "unknown"
-  }
-  return "unknown"
-}
+export { resolveRg, isRgAvailable } from "./ripgrep-resolve"
+export { ensureRg } from "./ripgrep-install"
+export type { EnsureRgResult } from "./ripgrep-install"

package/src/similarity.ts

@@ -28,7 +28,7 @@ interface TfIdfDocument {
   magnitude: number
 }
 
-interface SerializedTfIdf {
+export interface SerializedTfIdf {
   idf: Record<string, number>
   docs: Array<{
     id: string
@@ -147,6 +147,18 @@ export class TfIdfAdapter implements SearchAdapter {
         }
       }
 
+      // Boost: intent phrase contains query token
+      const intents = doc.entry.entry.intents || []
+      for (const intent of intents) {
+        const intentLower = intent.toLowerCase()
+        for (const token of queryTokens) {
+          if (intentLower.includes(token)) {
+            score += 0.12
+            break // one boost per intent phrase
+          }
+        }
+      }
+
       // Boost: name contains query token
       const nameLower = doc.entry.entry.name.toLowerCase().replace(/[-_]/g, " ")
       for (const token of queryTokens) {

package/src/stash-ref.ts

@@ -0,0 +1,41 @@
+import path from "node:path"
+import { type AgentikitAssetType, isAssetType } from "./common"
+
+export interface OpenRef {
+  type: AgentikitAssetType
+  name: string
+}
+
+export function parseOpenRef(ref: string): OpenRef {
+  const separator = ref.indexOf(":")
+  if (separator <= 0) {
+    throw new Error("Invalid open ref. Expected format '<type>:<name>'.")
+  }
+  const rawType = ref.slice(0, separator)
+  const rawName = ref.slice(separator + 1)
+  if (!isAssetType(rawType)) {
+    throw new Error(`Invalid open ref type: "${rawType}".`)
+  }
+  let name: string
+  try {
+    name = decodeURIComponent(rawName)
+  } catch {
+    throw new Error("Invalid open ref encoding.")
+  }
+  const normalized = path.posix.normalize(name.replace(/\\/g, "/"))
+  if (
+    !name
+    || name.includes("\0")
+    || /^[A-Za-z]:/.test(name)
+    || path.posix.isAbsolute(normalized)
+    || normalized === ".."
+    || normalized.startsWith("../")
+  ) {
+    throw new Error("Invalid open ref name.")
+  }
+  return { type: rawType, name: normalized }
+}
+
+export function makeOpenRef(type: AgentikitAssetType, name: string): string {
+  return `${type}:${encodeURIComponent(name)}`
+}

package/src/stash-resolve.ts

@@ -0,0 +1,47 @@
+import fs from "node:fs"
+import path from "node:path"
+import { type AgentikitAssetType, hasErrnoCode, isWithin } from "./common"
+import { TYPE_DIRS, isRelevantAssetFile, resolveAssetPathFromName } from "./asset-spec"
+
+export function resolveAssetPath(stashDir: string, type: AgentikitAssetType, name: string): string {
+  const root = path.join(stashDir, TYPE_DIRS[type])
+  const target = resolveAssetPathFromName(type, root, name)
+  const resolvedRoot = resolveAndValidateTypeRoot(root, type, name)
+  const resolvedTarget = path.resolve(target)
+  if (!isWithin(resolvedTarget, resolvedRoot)) {
+    throw new Error("Ref resolves outside the stash root.")
+  }
+  if (!fs.existsSync(resolvedTarget) || !fs.statSync(resolvedTarget).isFile()) {
+    throw new Error(`Stash asset not found for ref: ${type}:${name}`)
+  }
+  const realTarget = fs.realpathSync(resolvedTarget)
+  if (!isWithin(realTarget, resolvedRoot)) {
+    throw new Error("Ref resolves outside the stash root.")
+  }
+  if (!isRelevantAssetFile(type, path.basename(resolvedTarget))) {
+    if (type === "tool") {
+      throw new Error("Tool ref must resolve to a .sh, .ts, .js, .ps1, .cmd, or .bat file.")
+    }
+    throw new Error(`Stash asset not found for ref: ${type}:${name}`)
+  }
+  return realTarget
+}
+
+function resolveAndValidateTypeRoot(root: string, type: AgentikitAssetType, name: string): string {
+  const rootStat = readTypeRootStat(root, type, name)
+  if (!rootStat.isDirectory()) {
+    throw new Error(`Stash type root is not a directory for ref: ${type}:${name}`)
+  }
+  return fs.realpathSync(root)
+}
+
+function readTypeRootStat(root: string, type: AgentikitAssetType, name: string): fs.Stats {
+  try {
+    return fs.statSync(root)
+  } catch (error: unknown) {
+    if (hasErrnoCode(error, "ENOENT")) {
+      throw new Error(`Stash type root not found for ref: ${type}:${name}`)
+    }
+    throw error
+  }
+}