@ouro.bot/cli 0.1.0-alpha.36 → 0.1.0-alpha.38

package/dist/repertoire/tools-base.js

@@ -33,37 +33,31 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.finalAnswerTool = exports.baseToolHandlers = exports.tools = exports.baseToolDefinitions = void 0;
+exports.finalAnswerTool = exports.baseToolHandlers = exports.tools = exports.baseToolDefinitions = exports.editFileReadTracker = void 0;
 const fs = __importStar(require("fs"));
+const fg = __importStar(require("fast-glob"));
 const child_process_1 = require("child_process");
 const path = __importStar(require("path"));
 const skills_1 = require("./skills");
 const config_1 = require("../heart/config");
 const runtime_1 = require("../nerves/runtime");
 const identity_1 = require("../heart/identity");
-const tasks_1 = require("./tasks");
 const tools_1 = require("./coding/tools");
 const memory_1 = require("../mind/memory");
 const pending_1 = require("../mind/pending");
-const postIt = (msg) => `post-it from past you:\n${msg}`;
-function normalizeOptionalText(value) {
-    if (typeof value !== "string")
-        return null;
-    const trimmed = value.trim();
-    return trimmed.length > 0 ? trimmed : null;
-}
-function buildTaskCreateInput(args) {
-    return {
-        title: args.title,
-        type: args.type,
-        category: args.category,
-        body: args.body,
-        status: normalizeOptionalText(args.status) ?? undefined,
-        validator: normalizeOptionalText(args.validator),
-        requester: normalizeOptionalText(args.requester),
-        cadence: normalizeOptionalText(args.cadence),
-        scheduledAt: normalizeOptionalText(args.scheduledAt),
-    };
+// Tracks which file paths have been read via read_file in this session.
+// edit_file requires a file to be read first (must-read-first guard).
+exports.editFileReadTracker = new Set();
+function buildContextDiff(lines, changeStart, changeEnd, contextSize = 3) {
+    const start = Math.max(0, changeStart - contextSize);
+    const end = Math.min(lines.length, changeEnd + contextSize);
+    const result = [];
+    for (let i = start; i < end; i++) {
+        const lineNum = i + 1;
+        const prefix = (i >= changeStart && i < changeEnd) ? ">" : " ";
+        result.push(`${prefix} ${lineNum} | ${lines[i]}`);
+    }
+    return result.join("\n");
 }
 exports.baseToolDefinitions = [
     {
@@ -74,12 +68,27 @@ exports.baseToolDefinitions = [
                 description: "read file contents",
                 parameters: {
                     type: "object",
-                    properties: { path: { type: "string" } },
+                    properties: {
+                        path: { type: "string" },
+                        offset: { type: "number", description: "1-based line number to start reading from" },
+                        limit: { type: "number", description: "maximum number of lines to return" },
+                    },
                     required: ["path"],
                 },
             },
         },
-        handler: (a) => fs.readFileSync(a.path, "utf-8"),
+        handler: (a) => {
+            const content = fs.readFileSync(a.path, "utf-8");
+            exports.editFileReadTracker.add(a.path);
+            const offset = a.offset ? parseInt(a.offset, 10) : undefined;
+            const limit = a.limit ? parseInt(a.limit, 10) : undefined;
+            if (offset === undefined && limit === undefined)
+                return content;
+            const lines = content.split("\n");
+            const start = offset ? offset - 1 : 0;
+            const end = limit !== undefined ? start + limit : lines.length;
+            return lines.slice(start, end).join("\n");
+        },
     },
     {
         tool: {
@@ -104,97 +113,203 @@ exports.baseToolDefinitions = [
         tool: {
             type: "function",
             function: {
-                name: "shell",
-                description: "run shell command",
+                name: "edit_file",
+                description: "surgically edit a file by replacing an exact string. the file must have been read via read_file first. old_string must match exactly one location in the file.",
                 parameters: {
                     type: "object",
-                    properties: { command: { type: "string" } },
-                    required: ["command"],
+                    properties: {
+                        path: { type: "string" },
+                        old_string: { type: "string" },
+                        new_string: { type: "string" },
+                    },
+                    required: ["path", "old_string", "new_string"],
                 },
             },
         },
-        handler: (a) => (0, child_process_1.execSync)(a.command, { encoding: "utf-8", timeout: 30000 }),
+        handler: (a) => {
+            if (!exports.editFileReadTracker.has(a.path)) {
+                return `error: you must read the file with read_file before editing it. call read_file on ${a.path} first.`;
+            }
+            let content;
+            try {
+                content = fs.readFileSync(a.path, "utf-8");
+            }
+            catch (e) {
+                return `error: could not read file: ${e instanceof Error ? e.message : /* v8 ignore next -- defensive: non-Error catch branch @preserve */ String(e)}`;
+            }
+            // Count occurrences
+            const occurrences = [];
+            let searchFrom = 0;
+            while (true) {
+                const idx = content.indexOf(a.old_string, searchFrom);
+                if (idx === -1)
+                    break;
+                occurrences.push(idx);
+                searchFrom = idx + 1;
+            }
+            if (occurrences.length === 0) {
+                return `error: old_string not found in ${a.path}`;
+            }
+            if (occurrences.length > 1) {
+                return `error: old_string is ambiguous -- found ${occurrences.length} matches in ${a.path}. provide more context to make the match unique.`;
+            }
+            // Single unique match -- replace
+            const idx = occurrences[0];
+            const updated = content.slice(0, idx) + a.new_string + content.slice(idx + a.old_string.length);
+            fs.writeFileSync(a.path, updated, "utf-8");
+            // Build contextual diff
+            const lines = updated.split("\n");
+            const prefixLines = content.slice(0, idx).split("\n");
+            const changeStartLine = prefixLines.length - 1;
+            const newStringLines = a.new_string.split("\n");
+            const changeEndLine = changeStartLine + newStringLines.length;
+            return buildContextDiff(lines, changeStartLine, changeEndLine);
+        },
     },
     {
         tool: {
             type: "function",
             function: {
-                name: "list_directory",
-                description: "list directory contents",
+                name: "glob",
+                description: "find files matching a glob pattern. returns matching paths sorted alphabetically, one per line.",
                 parameters: {
                     type: "object",
-                    properties: { path: { type: "string" } },
-                    required: ["path"],
+                    properties: {
+                        pattern: { type: "string", description: "glob pattern (e.g. **/*.ts)" },
+                        cwd: { type: "string", description: "directory to search from (defaults to process.cwd())" },
+                    },
+                    required: ["pattern"],
                 },
             },
         },
-        handler: (a) => fs
-            .readdirSync(a.path, { withFileTypes: true })
-            .map((e) => `${e.isDirectory() ? "d" : "-"}  ${e.name}`)
-            .join("\n"),
+        handler: (a) => {
+            const cwd = a.cwd || process.cwd();
+            const matches = fg.globSync(a.pattern, { cwd, dot: true });
+            return matches.sort().join("\n");
+        },
     },
     {
         tool: {
             type: "function",
             function: {
-                name: "git_commit",
-                description: "commit changes to git with explicit paths",
+                name: "grep",
+                description: "search file contents for lines matching a regex pattern. searches recursively when given a directory. returns matching lines with file path and line numbers.",
                 parameters: {
                     type: "object",
                     properties: {
-                        message: { type: "string" },
-                        paths: { type: "array", items: { type: "string" } },
+                        pattern: { type: "string", description: "regex pattern to search for" },
+                        path: { type: "string", description: "file or directory to search" },
+                        context_lines: { type: "number", description: "number of surrounding context lines (default 0)" },
+                        include: { type: "string", description: "glob filter to limit searched files (e.g. *.ts)" },
                     },
-                    required: ["message", "paths"],
+                    required: ["pattern", "path"],
                 },
             },
         },
         handler: (a) => {
-            try {
-                if (!a.paths || !Array.isArray(a.paths) || a.paths.length === 0) {
-                    return postIt("paths are required. specify explicit files to commit.");
+            const targetPath = a.path;
+            const regex = new RegExp(a.pattern);
+            const contextLines = parseInt(a.context_lines || "0", 10);
+            const includeGlob = a.include || undefined;
+            function searchFile(filePath) {
+                let content;
+                try {
+                    content = fs.readFileSync(filePath, "utf-8");
+                }
+                catch {
+                    return [];
                 }
-                for (const p of a.paths) {
-                    if (!fs.existsSync(p)) {
-                        return postIt(`path does not exist: ${p}`);
+                const lines = content.split("\n");
+                const matchIndices = new Set();
+                for (let i = 0; i < lines.length; i++) {
+                    if (regex.test(lines[i])) {
+                        matchIndices.add(i);
                     }
-                    (0, child_process_1.execSync)(`git add ${p}`, { encoding: "utf-8" });
                 }
-                const diff = (0, child_process_1.execSync)("git diff --cached --stat", { encoding: "utf-8" });
-                if (!diff || diff.trim().length === 0) {
-                    return postIt("nothing was staged. check your changes or paths.");
+                if (matchIndices.size === 0)
+                    return [];
+                const outputIndices = new Set();
+                for (const idx of matchIndices) {
+                    const start = Math.max(0, idx - contextLines);
+                    const end = Math.min(lines.length - 1, idx + contextLines);
+                    for (let i = start; i <= end; i++) {
+                        outputIndices.add(i);
+                    }
                 }
-                (0, child_process_1.execSync)(`git commit -m \"${a.message}\"`, { encoding: "utf-8" });
-                return `${diff}\ncommitted`;
+                const sortedIndices = [...outputIndices].sort((a, b) => a - b);
+                const results = [];
+                for (const idx of sortedIndices) {
+                    const lineNum = idx + 1;
+                    if (matchIndices.has(idx)) {
+                        results.push(`${filePath}:${lineNum}: ${lines[idx]}`);
+                    }
+                    else {
+                        results.push(`-${filePath}:${lineNum}: ${lines[idx]}`);
+                    }
+                }
+                return results;
             }
-            catch (e) {
-                return `failed: ${e}`;
+            function collectFiles(dirPath) {
+                const files = [];
+                function walk(dir) {
+                    let entries;
+                    try {
+                        entries = fs.readdirSync(dir, { withFileTypes: true });
+                    }
+                    catch {
+                        return;
+                    }
+                    for (const entry of entries) {
+                        const fullPath = path.join(dir, entry.name);
+                        if (entry.isDirectory()) {
+                            walk(fullPath);
+                        }
+                        else if (entry.isFile()) {
+                            files.push(fullPath);
+                        }
+                    }
+                }
+                walk(dirPath);
+                return files.sort();
+            }
+            function matchesGlob(filePath, glob) {
+                const escaped = glob
+                    .replace(/[.+^${}()|[\]\\]/g, "\\$&")
+                    .replace(/\*/g, ".*")
+                    .replace(/\?/g, ".");
+                return new RegExp(`(^|/)${escaped}$`).test(filePath);
+            }
+            const stat = fs.statSync(targetPath, { throwIfNoEntry: false });
+            if (!stat)
+                return "";
+            if (stat.isFile()) {
+                return searchFile(targetPath).join("\n");
+            }
+            let files = collectFiles(targetPath);
+            if (includeGlob) {
+                files = files.filter((f) => matchesGlob(f, includeGlob));
             }
+            const allResults = [];
+            for (const file of files) {
+                allResults.push(...searchFile(file));
+            }
+            return allResults.join("\n");
         },
     },
     {
         tool: {
             type: "function",
             function: {
-                name: "gh_cli",
-                description: "execute a GitHub CLI (gh) command. use carefully.",
+                name: "shell",
+                description: "run shell command",
                 parameters: {
                     type: "object",
-                    properties: {
-                        command: { type: "string" },
-                    },
+                    properties: { command: { type: "string" } },
                     required: ["command"],
                 },
             },
         },
-        handler: (a) => {
-            try {
-                return (0, child_process_1.execSync)(`gh ${a.command}`, { encoding: "utf-8", timeout: 60000 });
-            }
-            catch (e) {
-                return `error: ${e}`;
-            }
-        },
+        handler: (a) => (0, child_process_1.execSync)(a.command, { encoding: "utf-8", timeout: 30000 }),
     },
     {
         tool: {
@@ -229,20 +344,6 @@ exports.baseToolDefinitions = [
             }
         },
     },
-    {
-        tool: {
-            type: "function",
-            function: {
-                name: "get_current_time",
-                description: "get the current date and time in America/Los_Angeles (Pacific Time)",
-                parameters: { type: "object", properties: {} },
-            },
-        },
-        handler: () => new Date().toLocaleString("en-US", {
-            timeZone: "America/Los_Angeles",
-            hour12: false,
-        }),
-    },
     {
         tool: {
             type: "function",
@@ -398,192 +499,6 @@ exports.baseToolDefinitions = [
             return JSON.stringify(friend, null, 2);
         },
     },
-    {
-        tool: {
-            type: "function",
-            function: {
-                name: "task_board",
-                description: "show the task board grouped by status",
-                parameters: { type: "object", properties: {} },
-            },
-        },
-        handler: () => {
-            const board = (0, tasks_1.getTaskModule)().getBoard();
-            return board.full || board.compact || "no tasks found";
-        },
-    },
-    {
-        tool: {
-            type: "function",
-            function: {
-                name: "task_create",
-                description: "create a new task in the bundle task system. optionally set `scheduledAt` for a one-time reminder or `cadence` for recurring daemon-scheduled work.",
-                parameters: {
-                    type: "object",
-                    properties: {
-                        title: { type: "string" },
-                        type: { type: "string", enum: ["one-shot", "ongoing", "habit"] },
-                        category: { type: "string" },
-                        body: { type: "string" },
-                        status: { type: "string" },
-                        validator: { type: "string" },
-                        requester: { type: "string" },
-                        scheduledAt: { type: "string", description: "ISO timestamp for a one-time scheduled run/reminder" },
-                        cadence: { type: "string", description: "recurrence like 30m, 1h, 1d, or cron" },
-                    },
-                    required: ["title", "type", "category", "body"],
-                },
-            },
-        },
-        handler: (a) => {
-            try {
-                const created = (0, tasks_1.getTaskModule)().createTask(buildTaskCreateInput(a));
-                return `created: ${created}`;
-            }
-            catch (error) {
-                return `error: ${error instanceof Error ? error.message : String(error)}`;
-            }
-        },
-    },
-    {
-        tool: {
-            type: "function",
-            function: {
-                name: "schedule_reminder",
-                description: "create a scheduled reminder or recurring daemon job. use `scheduledAt` for one-time reminders and `cadence` for recurring reminders. this writes canonical task fields that the daemon reconciles into OS-level jobs.",
-                parameters: {
-                    type: "object",
-                    properties: {
-                        title: { type: "string" },
-                        body: { type: "string" },
-                        category: { type: "string" },
-                        scheduledAt: { type: "string", description: "ISO timestamp for a one-time reminder" },
-                        cadence: { type: "string", description: "recurrence like 30m, 1h, 1d, or cron" },
-                    },
-                    required: ["title", "body"],
-                },
-            },
-        },
-        handler: (a) => {
-            const scheduledAt = normalizeOptionalText(a.scheduledAt);
-            const cadence = normalizeOptionalText(a.cadence);
-            if (!scheduledAt && !cadence) {
-                return "error: provide scheduledAt or cadence";
-            }
-            try {
-                const created = (0, tasks_1.getTaskModule)().createTask({
-                    title: a.title,
-                    type: cadence ? "habit" : "one-shot",
-                    category: normalizeOptionalText(a.category) ?? "reminder",
-                    body: a.body,
-                    scheduledAt,
-                    cadence,
-                });
-                return `created: ${created}`;
-            }
-            catch (error) {
-                return `error: ${error instanceof Error ? error.message : String(error)}`;
-            }
-        },
-    },
-    {
-        tool: {
-            type: "function",
-            function: {
-                name: "task_update_status",
-                description: "update a task status using validated transitions",
-                parameters: {
-                    type: "object",
-                    properties: {
-                        name: { type: "string" },
-                        status: { type: "string" },
-                    },
-                    required: ["name", "status"],
-                },
-            },
-        },
-        handler: (a) => {
-            const result = (0, tasks_1.getTaskModule)().updateStatus(a.name, a.status);
-            if (!result.ok) {
-                return `error: ${result.reason ?? "status update failed"}`;
-            }
-            const archivedSuffix = result.archived && result.archived.length > 0
-                ? ` | archived: ${result.archived.join(", ")}`
-                : "";
-            return `updated: ${a.name} -> ${result.to}${archivedSuffix}`;
-        },
-    },
-    {
-        tool: {
-            type: "function",
-            function: {
-                name: "task_board_status",
-                description: "show board detail for a specific status",
-                parameters: {
-                    type: "object",
-                    properties: {
-                        status: { type: "string" },
-                    },
-                    required: ["status"],
-                },
-            },
-        },
-        handler: (a) => {
-            const lines = (0, tasks_1.getTaskModule)().boardStatus(a.status);
-            return lines.length > 0 ? lines.join("\n") : "no tasks in that status";
-        },
-    },
-    {
-        tool: {
-            type: "function",
-            function: {
-                name: "task_board_action",
-                description: "show tasks or validation issues that require action",
-                parameters: {
-                    type: "object",
-                    properties: {
-                        scope: { type: "string" },
-                    },
-                },
-            },
-        },
-        handler: (a) => {
-            const lines = (0, tasks_1.getTaskModule)().boardAction();
-            if (!a.scope) {
-                return lines.length > 0 ? lines.join("\n") : "no action required";
-            }
-            const filtered = lines.filter((line) => line.includes(a.scope));
-            return filtered.length > 0 ? filtered.join("\n") : "no matching action items";
-        },
-    },
-    {
-        tool: {
-            type: "function",
-            function: {
-                name: "task_board_deps",
-                description: "show unresolved task dependencies",
-                parameters: { type: "object", properties: {} },
-            },
-        },
-        handler: () => {
-            const lines = (0, tasks_1.getTaskModule)().boardDeps();
-            return lines.length > 0 ? lines.join("\n") : "no unresolved dependencies";
-        },
-    },
-    {
-        tool: {
-            type: "function",
-            function: {
-                name: "task_board_sessions",
-                description: "show tasks with active coding or sub-agent sessions",
-                parameters: { type: "object", properties: {} },
-            },
-        },
-        handler: () => {
-            const lines = (0, tasks_1.getTaskModule)().boardSessions();
-            return lines.length > 0 ? lines.join("\n") : "no active sessions";
-        },
-    },
     {
         tool: {
             type: "function",
@@ -741,12 +656,18 @@ exports.baseToolDefinitions = [
             const key = args.key || "session";
             const content = args.content;
             const now = Date.now();
-            const pendingDir = (0, pending_1.getPendingDir)((0, identity_1.getAgentName)(), friendId, channel, key);
+            const agentName = (0, identity_1.getAgentName)();
+            // Self-routing: messages to "self" always go to inner dialog pending dir,
+            // regardless of the channel or key the agent specified.
+            const isSelf = friendId === "self";
+            const pendingDir = isSelf
+                ? (0, pending_1.getPendingDir)(agentName, "self", "inner", "dialog")
+                : (0, pending_1.getPendingDir)(agentName, friendId, channel, key);
             fs.mkdirSync(pendingDir, { recursive: true });
             const fileName = `${now}-${Math.random().toString(36).slice(2, 10)}.json`;
             const filePath = path.join(pendingDir, fileName);
             const envelope = {
-                from: (0, identity_1.getAgentName)(),
+                from: agentName,
                 friendId,
                 channel,
                 key,
@@ -755,7 +676,8 @@ exports.baseToolDefinitions = [
             };
             fs.writeFileSync(filePath, JSON.stringify(envelope, null, 2));
             const preview = content.length > 80 ? content.slice(0, 80) + "…" : content;
-            return `message queued for delivery to ${friendId} on ${channel}/${key}. preview: "${preview}". it will be delivered when their session is next active.`;
+            const target = isSelf ? "inner/dialog" : `${channel}/${key}`;
+            return `message queued for delivery to ${friendId} on ${target}. preview: "${preview}". it will be delivered when their session is next active.`;
         },
     },
     ...tools_1.codingToolDefinitions,

package/dist/repertoire/tools.js

@@ -18,14 +18,8 @@ Object.defineProperty(exports, "finalAnswerTool", { enumerable: true, get: funct
 var tools_teams_2 = require("./tools-teams");
 Object.defineProperty(exports, "teamsTools", { enumerable: true, get: function () { return tools_teams_2.teamsTools; } });
 // All tool definitions in a single registry
-const allDefinitions = [
-    ...tools_base_1.baseToolDefinitions,
-    ...tools_bluebubbles_1.bluebubblesToolDefinitions,
-    ...tools_teams_1.teamsToolDefinitions,
-    ...ado_semantic_1.adoSemanticToolDefinitions,
-    ...tools_github_1.githubToolDefinitions,
-];
-const REMOTE_BLOCKED_LOCAL_TOOLS = new Set(["shell", "read_file", "write_file", "git_commit", "gh_cli"]);
+const allDefinitions = [...tools_base_1.baseToolDefinitions, ...tools_bluebubbles_1.bluebubblesToolDefinitions, ...tools_teams_1.teamsToolDefinitions, ...ado_semantic_1.adoSemanticToolDefinitions, ...tools_github_1.githubToolDefinitions];
+const REMOTE_BLOCKED_LOCAL_TOOLS = new Set(["shell", "read_file", "write_file", "edit_file", "glob", "grep"]);
 function isRemoteChannel(capabilities) {
     return capabilities?.channel === "teams" || capabilities?.channel === "bluebubbles";
 }
@@ -183,28 +177,16 @@ function summarizeArgs(name, args) {
     // Base tools
     if (name === "read_file" || name === "write_file")
         return summarizeKeyValues(args, ["path"]);
-    if (name === "shell")
-        return summarizeKeyValues(args, ["command"]);
-    if (name === "list_directory")
+    if (name === "edit_file")
         return summarizeKeyValues(args, ["path"]);
-    if (name === "git_commit")
-        return summarizeKeyValues(args, ["message"]);
-    if (name === "gh_cli")
+    if (name === "glob")
+        return summarizeKeyValues(args, ["pattern", "cwd"]);
+    if (name === "grep")
+        return summarizeKeyValues(args, ["pattern", "path", "include"]);
+    if (name === "shell")
         return summarizeKeyValues(args, ["command"]);
     if (name === "load_skill")
         return summarizeKeyValues(args, ["name"]);
-    if (name === "task_create")
-        return summarizeKeyValues(args, ["title", "type", "category", "scheduledAt", "cadence"]);
-    if (name === "schedule_reminder")
-        return summarizeKeyValues(args, ["title", "scheduledAt", "cadence"]);
-    if (name === "task_update_status")
-        return summarizeKeyValues(args, ["name", "status"]);
-    if (name === "task_board_status")
-        return summarizeKeyValues(args, ["status"]);
-    if (name === "task_board_action")
-        return summarizeKeyValues(args, ["scope"]);
-    if (name === "task_board" || name === "task_board_deps" || name === "task_board_sessions")
-        return "";
     if (name === "coding_spawn")
         return summarizeKeyValues(args, ["runner", "workdir", "taskRef"]);
     if (name === "coding_status")