@ouro.bot/cli 0.1.0-alpha.84 → 0.1.0-alpha.85

package/changelog.json

@@ -1,6 +1,13 @@
 {
   "_note": "This changelog is maintained as part of the PR/version-bump workflow. Agent-curated, not auto-generated. Agents read this file directly via read_file to understand what changed between versions.",
   "versions": [
+    {
+      "version": "0.1.0-alpha.85",
+      "changes": [
+        "Relative repo paths now route through the chosen safe workspace too, so read/edit/write file tools actually operate in the dedicated clone or worktree instead of silently hitting the wrong checkout.",
+        "File-edit guardrails now normalize paths the same way file reads do, which means a `read_file` followed by `edit_file` on the same relative path no longer self-blocks during safe-workspace routing."
+      ]
+    },
     {
       "version": "0.1.0-alpha.84",
       "changes": [

package/dist/heart/safe-workspace.js

@@ -222,8 +222,16 @@ function ensureSafeRepoWorkspace(options = {}) {
     return selection;
 }
 function resolveSafeRepoPath(options) {
-    const requestedPath = path.resolve(options.requestedPath);
+    const rawRequestedPath = options.requestedPath;
     const repoRoot = path.resolve(options.repoRoot ?? (0, identity_1.getRepoRoot)());
+    if (!path.isAbsolute(rawRequestedPath) && !rawRequestedPath.startsWith("~")) {
+        const selection = activeSelection ?? ensureSafeRepoWorkspace(options);
+        return {
+            selection,
+            resolvedPath: path.resolve(selection.workspaceRoot, rawRequestedPath),
+        };
+    }
+    const requestedPath = path.resolve(rawRequestedPath);
     if (activeSelection && requestedPath.startsWith(activeSelection.workspaceRoot + path.sep)) {
         return { selection: activeSelection, resolvedPath: requestedPath };
     }

package/dist/repertoire/tools.js

@@ -13,6 +13,7 @@ const tools_github_1 = require("./tools-github");
 const runtime_1 = require("../nerves/runtime");
 const guardrails_1 = require("./guardrails");
 const identity_1 = require("../heart/identity");
+const safe_workspace_1 = require("../heart/safe-workspace");
 function safeGetAgentRoot() {
     try {
         return (0, identity_1.getAgentRoot)();
@@ -99,6 +100,15 @@ function isConfirmationRequired(toolName) {
     const def = allDefinitions.find((d) => d.tool.function.name === toolName);
     return def?.confirmationRequired === true;
 }
+function normalizeGuardArgs(name, args) {
+    if ((name === "read_file" || name === "write_file" || name === "edit_file") && args.path) {
+        return {
+            ...args,
+            path: (0, safe_workspace_1.resolveSafeRepoPath)({ requestedPath: args.path }).resolvedPath,
+        };
+    }
+    return args;
+}
 async function execTool(name, args, ctx) {
     (0, runtime_1.emitNervesEvent)({
         event: "tool.start",
@@ -124,7 +134,8 @@ async function execTool(name, args, ctx) {
         trustLevel: ctx?.context?.friend?.trustLevel,
         agentRoot: safeGetAgentRoot(),
     };
-    const guardResult = (0, guardrails_1.guardInvocation)(name, args, guardContext);
+    const guardArgs = normalizeGuardArgs(name, args);
+    const guardResult = (0, guardrails_1.guardInvocation)(name, guardArgs, guardContext);
     if (!guardResult.allowed) {
         (0, runtime_1.emitNervesEvent)({
             level: "warn",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.84",
+  "version": "0.1.0-alpha.85",
   "main": "dist/heart/daemon/ouro-entry.js",
   "bin": {
     "cli": "dist/heart/daemon/ouro-bot-entry.js",