@aria-cli/tools 1.0.19 → 1.0.31

package/dist-cjs/executors/search-freshness.js

@@ -0,0 +1,235 @@
+"use strict";
+/**
+ * Freshness tracker for aria-search (code_search tool).
+ *
+ * Mirrors frg-freshness.ts patterns to close the freshness gaps:
+ * 1. Tracks file mutations from ARIA tool writes (session overlay)
+ * 2. Reconciles git-dirty files on each search
+ * 3. Generates session overlay for the napi search() call
+ *
+ * The session overlay gives 0ms visibility for pending mutations —
+ * files written by agents/users appear in search results immediately
+ * without waiting for an index rebuild or hot.log sync.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.recordSearchMutation = recordSearchMutation;
+exports.reconcileSearchGitDirty = reconcileSearchGitDirty;
+exports.getSearchSessionOverlay = getSearchSessionOverlay;
+exports.clearSearchMutations = clearSearchMutations;
+const fsSync = __importStar(require("node:fs"));
+const nodePath = __importStar(require("node:path"));
+const node_child_process_1 = require("node:child_process");
+const repoStates = new Map();
+/** Minimum interval between git-dirty reconciliations (avoid hammering git). */
+const GIT_RECONCILE_INTERVAL_MS = 2_000;
+/** Max content size to cache in memory per file. */
+const MAX_CACHED_CONTENT_BYTES = 256 * 1024;
+function norm(p) {
+    return nodePath.resolve(p);
+}
+function getState(root) {
+    const key = norm(root);
+    let state = repoStates.get(key);
+    if (!state) {
+        state = { sequence: 0, pending: new Map(), lastGitReconcileMs: 0 };
+        repoStates.set(key, state);
+    }
+    return state;
+}
+// ---------------------------------------------------------------------------
+// Public API — called from filesystem/patch executors
+// ---------------------------------------------------------------------------
+/**
+ * Record a file mutation from an ARIA tool write/edit/delete.
+ * Called alongside recordFrgMutation in filesystem.ts and apply-patch.ts.
+ */
+function recordSearchMutation(filePath, operation, content) {
+    // Find the git repo root to scope mutations correctly
+    const repoRoot = findGitRepoRoot(filePath);
+    if (!repoRoot)
+        return;
+    const state = getState(repoRoot);
+    state.sequence += 1;
+    const normalizedPath = norm(filePath);
+    state.pending.set(normalizedPath, {
+        path: normalizedPath,
+        operation,
+        content: typeof content === "string" && Buffer.byteLength(content, "utf8") <= MAX_CACHED_CONTENT_BYTES
+            ? content
+            : undefined,
+        sequence: state.sequence,
+    });
+}
+// ---------------------------------------------------------------------------
+// Public API — called from search executor
+// ---------------------------------------------------------------------------
+/**
+ * Reconcile git-dirty files into the pending mutations map.
+ * Runs `git diff --name-status -z HEAD` and `git ls-files -o --exclude-standard -z`
+ * to detect files modified/created/deleted by external agents or the user.
+ *
+ * Throttled to at most once per GIT_RECONCILE_INTERVAL_MS to avoid
+ * hammering git on rapid sequential searches.
+ */
+function reconcileSearchGitDirty(root) {
+    const state = getState(root);
+    const now = Date.now();
+    if (now - state.lastGitReconcileMs < GIT_RECONCILE_INTERVAL_MS) {
+        return; // Throttled — recent reconciliation is still fresh enough
+    }
+    state.lastGitReconcileMs = now;
+    const normalizedRoot = norm(root);
+    // Tracked modified/deleted files
+    const trackedOutput = runGit(normalizedRoot, ["diff", "--name-status", "-z", "HEAD", "--"]);
+    if (trackedOutput) {
+        const tokens = trackedOutput.split("\0").filter(Boolean);
+        for (let i = 0; i < tokens.length; i++) {
+            const status = tokens[i] ?? "";
+            if (status.startsWith("R")) {
+                // Rename: old path deleted, new path written
+                const oldPath = tokens[++i];
+                const newPath = tokens[++i];
+                if (oldPath)
+                    addGitDirtyMutation(state, normalizedRoot, oldPath, "delete");
+                if (newPath)
+                    addGitDirtyMutation(state, normalizedRoot, newPath, "write");
+                continue;
+            }
+            const filePath = tokens[++i];
+            if (!filePath)
+                continue;
+            addGitDirtyMutation(state, normalizedRoot, filePath, status.startsWith("D") ? "delete" : "write");
+        }
+    }
+    // Untracked new files
+    const untrackedOutput = runGit(normalizedRoot, ["ls-files", "-o", "--exclude-standard", "-z"]);
+    if (untrackedOutput) {
+        for (const token of untrackedOutput.split("\0").filter(Boolean)) {
+            addGitDirtyMutation(state, normalizedRoot, token, "write");
+        }
+    }
+}
+function addGitDirtyMutation(state, root, relativePath, operation) {
+    const absPath = norm(nodePath.join(root, relativePath));
+    const existing = state.pending.get(absPath);
+    // Don't overwrite ARIA-sourced mutations (which have cached content)
+    if (existing?.content)
+        return;
+    if (existing?.operation === operation)
+        return;
+    state.sequence += 1;
+    state.pending.set(absPath, {
+        path: absPath,
+        operation,
+        content: undefined, // Will be read from disk in getSearchSessionOverlay
+        sequence: state.sequence,
+    });
+}
+/**
+ * Generate the session overlay for the napi search() call.
+ * Reads content from disk for mutations without cached content.
+ */
+function getSearchSessionOverlay(root) {
+    const state = getState(root);
+    const sessionWrites = [];
+    const sessionDeletes = [];
+    for (const mutation of state.pending.values()) {
+        if (mutation.operation === "delete") {
+            sessionDeletes.push(mutation.path);
+            continue;
+        }
+        let content = mutation.content;
+        if (typeof content !== "string") {
+            // Read from disk — closes the gap where git-dirty files have no cached content
+            try {
+                const buf = fsSync.readFileSync(mutation.path);
+                if (!buf.subarray(0, Math.min(buf.length, 8192)).includes(0)) {
+                    content = buf.toString("utf8");
+                }
+            }
+            catch {
+                continue; // Unreadable — skip
+            }
+        }
+        if (typeof content === "string") {
+            sessionWrites.push({ path: mutation.path, content });
+        }
+    }
+    return { sessionWrites, sessionDeletes };
+}
+/**
+ * Clear all pending mutations for a repo root.
+ * Called after a full index rebuild (all mutations are now in the base index).
+ */
+function clearSearchMutations(root) {
+    const key = norm(root);
+    repoStates.delete(key);
+}
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+function findGitRepoRoot(startPath) {
+    let current = norm(startPath);
+    try {
+        if (!fsSync.statSync(current).isDirectory()) {
+            current = nodePath.dirname(current);
+        }
+    }
+    catch {
+        current = nodePath.dirname(current);
+    }
+    while (true) {
+        if (fsSync.existsSync(nodePath.join(current, ".git")))
+            return current;
+        const parent = nodePath.dirname(current);
+        if (parent === current)
+            return null;
+        current = parent;
+    }
+}
+function runGit(cwd, args) {
+    try {
+        return (0, node_child_process_1.execFileSync)("git", args, {
+            cwd,
+            encoding: "utf8",
+            stdio: ["ignore", "pipe", "ignore"],
+        }).trim();
+    }
+    catch {
+        return null;
+    }
+}
+//# sourceMappingURL=search-freshness.js.map

package/dist-cjs/executors/search-types.js

@@ -0,0 +1,57 @@
+"use strict";
+/**
+ * Shared types and utilities for the unified search tool.
+ *
+ * Used by:
+ * - Base executor in @aria/tools (learning-meta.ts)
+ * - Runner wrapper in @aria/aria (search-wrapper.ts)
+ * - Tests
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SOURCE_PRIORITY = void 0;
+exports.dedupSearchResults = dedupSearchResults;
+// ---------------------------------------------------------------------------
+// Shared dedup logic — single source of truth for both base executor and wrapper
+// ---------------------------------------------------------------------------
+/** Source priority for dedup (lower = higher priority). */
+exports.SOURCE_PRIORITY = {
+    builtin: 0,
+    local_cli: 1,
+    memoria: 2,
+    local: 3,
+    "skills.sh": 4,
+    clawhub: 5,
+    npm: 6,
+    brew: 7,
+    web: 8,
+};
+/**
+ * Dedup search results by name with source priority.
+ * When the same name appears from multiple sources, keep the higher-priority one.
+ */
+function dedupSearchResults(results, limit) {
+    const deduped = new Map();
+    for (const item of results) {
+        const normalizedName = item.name.trim().toLowerCase();
+        const existing = deduped.get(normalizedName);
+        if (!existing) {
+            deduped.set(normalizedName, item);
+        }
+        else {
+            const existingPriority = exports.SOURCE_PRIORITY[existing.source] ?? 99;
+            const newPriority = exports.SOURCE_PRIORITY[item.source] ?? 99;
+            if (newPriority < existingPriority) {
+                deduped.set(normalizedName, item);
+            }
+        }
+    }
+    const sorted = [...deduped.values()].sort((a, b) => {
+        const aPriority = exports.SOURCE_PRIORITY[a.source] ?? 99;
+        const bPriority = exports.SOURCE_PRIORITY[b.source] ?? 99;
+        if (aPriority !== bPriority)
+            return aPriority - bPriority;
+        return a.name.localeCompare(b.name);
+    });
+    return sorted.slice(0, limit);
+}
+//# sourceMappingURL=search-types.js.map

package/dist-cjs/executors/search.js

@@ -0,0 +1,103 @@
+"use strict";
+/**
+ * Executor for the native indexed regex search tool.
+ *
+ * Freshness architecture (frg parity):
+ * 1. ARIA tool writes → recordSearchMutation → session overlay (0ms visibility)
+ * 2. External edits → reconcileSearchGitDirty → session overlay (0ms visibility)
+ * 3. Commit/version change → syncIndex or buildIndex (incremental/full)
+ * 4. Session overlay passed to napi search() — no index rebuild needed
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeSearch = executeSearch;
+const nodePath = __importStar(require("node:path"));
+const search_1 = require("@aria-cli/search");
+const utils_js_1 = require("./utils.js");
+const search_freshness_js_1 = require("./search-freshness.js");
+async function executeSearch(input, ctx) {
+    const opts = input;
+    const dir = nodePath.resolve(ctx.workingDir, opts.directory || ".");
+    try {
+        // Step 1: Index management — build or sync base index if needed.
+        const status = (0, search_1.indexStatus)(dir);
+        if (status.state === "none") {
+            (0, search_1.buildIndex)(dir);
+            (0, search_freshness_js_1.clearSearchMutations)(dir); // fresh index includes everything
+        }
+        else if (status.state === "stale") {
+            // Commit or binary version changed — incremental sync is sufficient
+            // (syncIndex rebuilds hot.log from git diff, much cheaper than full build).
+            // Only fall back to full build if sync fails.
+            try {
+                (0, search_1.syncIndex)(dir);
+            }
+            catch {
+                (0, search_1.buildIndex)(dir);
+            }
+            (0, search_freshness_js_1.clearSearchMutations)(dir);
+        }
+        // "ready" — base index is fresh, session overlay handles uncommitted changes
+        // Step 2: Reconcile git-dirty files into pending mutations.
+        // Detects files modified/created/deleted by external agents or the user.
+        // Throttled to avoid hammering git on rapid sequential searches.
+        (0, search_freshness_js_1.reconcileSearchGitDirty)(dir);
+        // Step 3: Generate session overlay from pending mutations.
+        // This gives 0ms visibility for ARIA tool writes and external edits —
+        // no index rebuild needed. The overlay is applied in-memory by the
+        // Rust search engine on top of the base index + hot.log.
+        const overlay = (0, search_freshness_js_1.getSearchSessionOverlay)(dir);
+        // Step 4: Search with overlay.
+        const results = (0, search_1.search)({
+            pattern: opts.pattern,
+            directory: dir,
+            maxResults: opts.maxResults ?? 1000,
+            fileGlob: opts.fileGlob,
+            fileType: opts.fileType,
+            caseSensitive: opts.caseSensitive ?? true,
+            literal: opts.literal ?? false,
+            context: opts.context ?? 0,
+            sessionWrites: overlay.sessionWrites,
+            sessionDeletes: overlay.sessionDeletes,
+        });
+        const truncated = results.length >= (opts.maxResults ?? 1000);
+        return (0, utils_js_1.success)(`Found ${results.length} matches for "${opts.pattern}"${truncated ? " (truncated)" : ""}`, { matches: results, truncated });
+    }
+    catch (err) {
+        const reason = err instanceof Error ? err.message : String(err);
+        return (0, utils_js_1.fail)(`Search failed: ${reason}`);
+    }
+}
+//# sourceMappingURL=search.js.map