@garuda-agent/garuda 0.16.0 → 0.17.0

package/dist/chunk-UIRJOQQS.js

@@ -0,0 +1,118 @@
+#!/usr/bin/env node
+import {
+  realpathOfNearestExisting
+} from "./chunk-4LFJFDCF.js";
+
+// src/permissions/writeScope.ts
+import { existsSync, lstatSync, mkdirSync, realpathSync } from "fs";
+import { realpath } from "fs/promises";
+import { isAbsolute, join, relative, resolve, sep } from "path";
+function scopeEntryProblem(entry) {
+  if (entry === "" || entry === "/" || entry === "." || entry === "./") {
+    return `"${entry}" is the whole worktree, not a scope`;
+  }
+  if (entry.startsWith("/") || /^[A-Za-z]:/.test(entry)) return `"${entry}" is not relative`;
+  const control = [...entry].some((c) => c.charCodeAt(0) < 32 || c.charCodeAt(0) === 127);
+  if (entry.includes("\\") || control) {
+    return `"${entry}" has a backslash or a control character`;
+  }
+  const parts = entry.replace(/\/$/, "").split("/");
+  if (parts.some((p) => p === "" || p === "." || p === "..")) {
+    return `"${entry}" has an empty, "." or ".." part`;
+  }
+  if (parts[0] === ".git" || parts[0] === ".garuda") return `"${entry}" is a protected folder`;
+  return void 0;
+}
+function inWriteScope(path, scope) {
+  const clean = path.replace(/^\.\//, "").replace(/\/+$/, "");
+  return scope.some(
+    (entry) => entry.endsWith("/") ? clean === entry.slice(0, -1) || clean.startsWith(entry) : clean === entry
+  );
+}
+function scopePaths(root, scope) {
+  return scope.map((entry) => join(root, ...entry.replace(/\/$/, "").split("/")));
+}
+function prepareWriteScope(root, scope) {
+  for (const entry of scope) {
+    const problem = scopeEntryProblem(entry);
+    if (problem !== void 0) return problem;
+  }
+  const realRoot = realpathSync(root);
+  for (const [i, path] of scopePaths(root, scope).entries()) {
+    const entry = scope[i];
+    let current = root;
+    for (const part of entry.replace(/\/$/, "").split("/")) {
+      current = join(current, part);
+      if (existsSync(current) && lstatSync(current).isSymbolicLink()) {
+        return `"${entry}" goes through a symbolic link (${current})`;
+      }
+    }
+    if (!existsSync(path) && entry.endsWith("/")) mkdirSync(path, { recursive: true });
+    if (existsSync(path)) {
+      const real = realpathSync(path);
+      if (real !== realRoot && !real.startsWith(`${realRoot}${sep}`)) {
+        return `"${entry}" is outside the worktree`;
+      }
+    }
+  }
+  return void 0;
+}
+var BUILD_OUTPUTS = [
+  { marker: "pom.xml", folders: ["target/"] },
+  { marker: "build.gradle", folders: ["build/", ".gradle/"] },
+  { marker: "build.gradle.kts", folders: ["build/", ".gradle/"] },
+  { marker: "package.json", folders: ["dist/", "coverage/"] },
+  { marker: "pyproject.toml", folders: ["build/", "dist/", ".pytest_cache/"] },
+  { marker: "setup.py", folders: ["build/", "dist/", ".pytest_cache/"] },
+  { marker: "Cargo.toml", folders: ["target/"] },
+  { marker: "go.mod", folders: [] }
+];
+function proposeWriteScope(rules, root) {
+  const entries = /* @__PURE__ */ new Set();
+  for (const rule of rules) {
+    const m = /^(edit_file|write_file)\((.*)\)$/.exec(rule.trim());
+    if (m === null) continue;
+    const pattern = m[2].replace(/^\.\//, "");
+    const glob = pattern.search(/[*?[{]/);
+    const entry = glob === -1 ? pattern : pattern.slice(0, pattern.lastIndexOf("/", glob) + 1);
+    if (entry === "" || scopeEntryProblem(entry) !== void 0) {
+      return { scope: void 0, reason: `the rule ${rule} names no folder` };
+    }
+    entries.add(entry);
+  }
+  for (const { marker, folders } of BUILD_OUTPUTS) {
+    if (existsSync(join(root, marker))) for (const f of folders) entries.add(f);
+  }
+  return { scope: [...entries].sort() };
+}
+async function scopeDenial(root, path, scope) {
+  const absolute = isAbsolute(path) ? path : resolve(root, path);
+  const named = relative(root, absolute).split(sep).join("/");
+  const outside = (shown) => `${shown} is outside this job's write scope (${scope.join(", ")})`;
+  if (named.startsWith("..") || !inWriteScope(named, scope)) return outside(named);
+  let realRoot;
+  let real;
+  try {
+    realRoot = await realpath(root);
+    real = await realpathOfNearestExisting(absolute);
+  } catch {
+    return `${named}: its real place cannot be checked`;
+  }
+  const reached = relative(realRoot, real).split(sep).join("/");
+  if (reached === "" || reached.startsWith("..") || isAbsolute(reached)) {
+    return `${named} leads outside the worktree`;
+  }
+  if (!inWriteScope(reached, scope))
+    return `${named} leads to ${reached}, which ${outside(reached).slice(reached.length + 1)}`;
+  return void 0;
+}
+
+export {
+  scopeEntryProblem,
+  inWriteScope,
+  scopePaths,
+  prepareWriteScope,
+  proposeWriteScope,
+  scopeDenial
+};
+//# sourceMappingURL=chunk-UIRJOQQS.js.map

package/dist/{chunk-KKB5W47S.js → chunk-VTMD5IHD.js}

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
+import {
+  scopeEntryProblem
+} from "./chunk-UIRJOQQS.js";
 import {
   parseRule
 } from "./chunk-3NJNVZTK.js";
@@ -29,6 +32,8 @@ var resultSchema = z.object({
   steps: z.number(),
   tokens: z.number(),
   costUsd: z.number().optional(),
+  /** The cost leaves out some spending: `costUsd` is a minimum (review of 1370184). */
+  costIncomplete: z.boolean().optional(),
   durationMs: z.number(),
   sessionId: z.string().optional(),
   commit: z.string().optional(),
@@ -55,7 +60,12 @@ var resultSchema = z.object({
       text: z.string(),
       costUsd: z.number().optional()
     }).optional(),
-    reviewError: z.string().optional()
+    reviewError: z.string().optional(),
+    /**
+     * The review spent tokens with no reported usage (a failed attempt, an estimate): its cost is
+     * a minimum or unrecorded (review of 3a9f51b).
+     */
+    reviewCostIncomplete: z.boolean().optional()
   }).optional()
 });
 var jobSchema = z.object({
@@ -76,6 +86,16 @@ var jobSchema = z.object({
   model: z.string().optional(),
   /** Permission rules for this job only, in the settings format ("edit_file(src/**)"). */
   allow: z.array(z.string()),
+  /**
+   * The write scope (0.17, review T6): the paths in the worktree that the job's commands and edits
+   * may change ("src/" is a folder, "README.md" one file). The OS sandbox enforces it for commands.
+   * Absent (a job made before 0.17, or a plan whose rules name no folder): the whole worktree.
+   */
+  writeScope: z.array(
+    z.string().refine((entry) => scopeEntryProblem(entry) === void 0, {
+      message: 'a scope entry is a path in the worktree, such as "src/" or "README.md"'
+    })
+  ).optional(),
   onUnapproved: z.literal("deny-and-continue"),
   /** "01:00" (local time) for `garuda run --at`, when the user gave one. */
   at: z.string().regex(/^([01]\d|2[0-3]):[0-5]\d$/).optional(),
@@ -114,6 +134,9 @@ var jobSchema = z.object({
   endedAt: z.string().optional(),
   result: resultSchema.optional()
 });
+function parseJob(json) {
+  return jobSchema.parse(json);
+}
 function newJobId(now = /* @__PURE__ */ new Date()) {
   const pad = (n) => String(n).padStart(2, "0");
   const date = `${now.getFullYear()}${pad(now.getMonth() + 1)}${pad(now.getDate())}`;
@@ -218,6 +241,7 @@ export {
   JOBS_DIR,
   DEFAULT_JOB_MAX_STEPS,
   JOB_STATUSES,
+  parseJob,
   newJobId,
   jobPath,
   failJobSync,
@@ -228,4 +252,4 @@ export {
   planPermissions,
   planTitle
 };
-//# sourceMappingURL=chunk-KKB5W47S.js.map
+//# sourceMappingURL=chunk-VTMD5IHD.js.map

package/dist/{chunk-ENLDPN4S.js → chunk-Z66BWTMD.js}

@@ -3,6 +3,7 @@ import {
   colorDiff
 } from "./chunk-4JSUUDFQ.js";
 import {
+  AuditDirError,
   SPECIALIST_SPECS,
   THINKING_WORDS,
   callersText,
@@ -16,12 +17,17 @@ import {
   referencesText,
   repoMapText,
   repoMapTool,
-  verifyAuditFile
-} from "./chunk-WIJL72ZE.js";
+  verifyAuditDir
+} from "./chunk-2DYMJMRQ.js";
+import {
+  budgetSpent,
+  isCostIncomplete,
+  pendingChildTokens
+} from "./chunk-735BKABA.js";
 import {
   WEB_SEARCH_USD,
   totalTokens
-} from "./chunk-R7I2NBPX.js";
+} from "./chunk-J4346IDH.js";
 import {
   BUILTIN_COMMANDS
 } from "./chunk-23FXBNBB.js";
@@ -30,7 +36,7 @@ import {
 } from "./chunk-EU7PA45O.js";
 import {
   listJobs
-} from "./chunk-KKB5W47S.js";
+} from "./chunk-VTMD5IHD.js";
 
 // src/cli/errors.ts
 function describeError(error) {
@@ -76,20 +82,32 @@ function formatTokens(n) {
   if (n < 1e6) return `${(n / 1e3).toFixed(1)}k`;
   return `${(n / 1e6).toFixed(1)}M`;
 }
-function formatUsd(usd) {
+function formatUsd(usd, incomplete = false) {
   if (usd === void 0) return "cost unknown";
-  return usd < 0.01 ? `$${usd.toFixed(4)}` : `$${usd.toFixed(2)}`;
+  const amount = usd < 0.01 ? `$${usd.toFixed(4)}` : `$${usd.toFixed(2)}`;
+  return incomplete ? `\u2265 ${amount} (incomplete)` : amount;
+}
+function budgetNote(session) {
+  const unreported = session.unreportedTokens;
+  const children = pendingChildTokens(session);
+  if (unreported <= 0 && children <= 0) return void 0;
+  const parts = [
+    ...unreported > 0 ? [`${formatTokens(unreported)} reserved without reported usage`] : [],
+    ...children > 0 ? [`${formatTokens(children)} from subagents with no report`] : []
+  ];
+  return `budget ${formatTokens(budgetSpent(session))} tokens (${parts.join(", ")})`;
 }
-function usageLine(result, session, runCostUsd, contextWindow) {
+function usageLine(result, session, runCostUsd, contextWindow, runCostIncomplete = false) {
   const u = result.usage;
   const input = u.inputTokens + u.cacheReadTokens + u.cacheWriteTokens;
   const percent = Math.round(session.contextTokens / contextWindow * 100);
   return [
     `${result.stopReason} \xB7 ${result.steps} step(s)`,
-    `${formatTokens(input)} in (${formatTokens(u.cacheReadTokens)} cached) / ${formatTokens(u.outputTokens)} out`,
-    formatUsd(runCostUsd),
+    `${budgetNote(session) !== void 0 ? "reported " : ""}${formatTokens(input)} in (${formatTokens(u.cacheReadTokens)} cached) / ${formatTokens(u.outputTokens)} out`,
+    formatUsd(runCostUsd, runCostIncomplete),
     `context ${percent}% of ${formatTokens(contextWindow)}`,
-    `session ${formatTokens(totalTokens(session.usage))} tokens, ${formatUsd(session.costUsd)}`
+    `session ${formatTokens(totalTokens(session.usage))} tokens, ${formatUsd(session.costUsd, isCostIncomplete(session))}`,
+    ...budgetNote(session) === void 0 ? [] : [budgetNote(session)]
   ].join(" \xB7 ");
 }
 function stopMessage(reason, limits) {
@@ -131,13 +149,19 @@ async function runTurn(runtime, approver, renderer, prompt, exitNow) {
   process.on("SIGINT", stop);
   approver.onInterrupt = stop;
   const costBefore = runtime.session?.costUsd ?? 0;
+  const unreportedBefore = runtime.session?.unreportedTokens ?? 0;
+  const incompleteBefore = runtime.session?.costIncomplete ?? false;
+  const pendingBefore = runtime.session === void 0 ? 0 : pendingChildTokens(runtime.session);
   try {
     const result = await runtime.runTurn(prompt, controller.signal);
     const session = runtime.session;
     if (session !== void 0) {
       const runCost = session.costUsd === void 0 ? void 0 : session.costUsd - costBefore;
-      renderer.info(`
-[${usageLine(result, session, runCost, runtime.limits.contextWindow)}]`);
+      const runIncomplete = session.unreportedTokens > unreportedBefore || pendingChildTokens(session) > pendingBefore || session.costIncomplete && !incompleteBefore;
+      renderer.info(
+        `
+[${usageLine(result, session, runCost, runtime.limits.contextWindow, runIncomplete)}]`
+      );
     }
     const message = stopMessage(result.stopReason, runtime.limits);
     if (message !== void 0) renderer.warn(message);
@@ -200,7 +224,7 @@ var HELP = [
   "  /jobs      the scheduled jobs of this project; /jobs <id> shows one; /jobs cancel|delete <id>; /jobs cancel night",
   "  /where X   where symbol X is defined (code index, no model call)",
   "  /defs X    alias of /where X (definitions of X)",
-  "  /refs X    every use of symbol X (code index, no model call)",
+  "  /refs X    indexed uses of symbol X (approximate except JS/TS, no model call)",
   "  /callers X who calls symbol X (code index, no model call)",
   "  /impact X  blast radius and affected tests for file or symbol X",
   "  /map [dir] what each code file exports and imports",
@@ -388,7 +412,7 @@ async function sessionsCommand(runtime, renderer, arg, signal) {
     const facts = [
       s.id,
       `${s.turns} turn${s.turns === 1 ? "" : "s"}`,
-      ...s.costUsd === void 0 || s.costUsd === 0 ? [] : [`$${s.costUsd.toFixed(2)}`],
+      ...s.costUsd === void 0 || s.costUsd === 0 && !s.costIncomplete ? [] : [`${s.costIncomplete ? "\u2265 " : ""}$${s.costUsd.toFixed(2)}`],
       ...s.model === void 0 ? [] : [s.model]
     ].join(" \xB7 ");
     return [
@@ -467,7 +491,7 @@ async function diffCommand(runtime, renderer, arg, output) {
   );
 }
 async function jobsCommand(runtime, renderer, id) {
-  const { listJobs: listJobs2, loadJob, JOBS_DIR } = await import("./job-3NYDMP2M.js");
+  const { listJobs: listJobs2, loadJob, JOBS_DIR } = await import("./job-7JOI4YIQ.js");
   const cancel = /^cancel\s+(\S+)$/.exec(id);
   if (cancel !== null) {
     renderer.info(await runtime.cancelJob(cancel[1]));
@@ -481,7 +505,7 @@ async function jobsCommand(runtime, renderer, id) {
   if (id !== "") {
     try {
       const job = await loadJob(runtime.root, id);
-      const { jobReport } = await import("./text-J2GD647J.js");
+      const { jobReport } = await import("./text-LS35WSRL.js");
       renderer.info(jobReport(job));
     } catch (error) {
       renderer.warn(error.message);
@@ -489,7 +513,7 @@ async function jobsCommand(runtime, renderer, id) {
     return;
   }
   const jobs = await listJobs2(runtime.root);
-  const { defaultAgentEnv, nightAgentTime } = await import("./launchd-SSX362VG.js");
+  const { defaultAgentEnv, nightAgentTime } = await import("./launchd-3A3ONEW5.js");
   const night = nightAgentTime(runtime.root, defaultAgentEnv());
   const nightLine = night === void 0 ? [] : [
     `Night shift: launchd starts the queue at ${night.toTimeString().slice(0, 5)} on ${night.toDateString()} (/jobs cancel night removes it).`
@@ -527,7 +551,7 @@ async function exportCommand(runtime, renderer, file) {
     renderer.info("There is no conversation to export yet.");
     return;
   }
-  const { sessionMarkdown, writeExport } = await import("./export-HN3CT7AV.js");
+  const { sessionMarkdown, writeExport } = await import("./export-SJ3DUP6W.js");
   const result = await writeExport(runtime.root, id, sessionMarkdown(records, id), file);
   if ("problem" in result) renderer.warn(result.problem);
   else
@@ -628,7 +652,7 @@ async function lookup(runtime, renderer, command, arg) {
     } else {
       text = repoMapText(await repoMapTool.run({ path: arg }, context));
     }
-    renderer.info(text);
+    renderer.info(text.startsWith("Approximate:") ? `\u2248 ${text}` : text);
   } catch (error) {
     renderer.error(error.message);
   }
@@ -706,22 +730,46 @@ async function auditCommand(runtime, renderer, arg) {
     }
   }
   if (arg === "verify") {
-    const files = await runtime.audit.files();
     lines.push("", `Audit files: ${runtime.audit.dir}`);
-    if (files.length === 0) lines.push("  none yet");
+    let results;
+    try {
+      results = await verifyAuditDir(runtime.audit.dir);
+    } catch (error) {
+      if (!(error instanceof AuditDirError)) throw error;
+      lines.push(`  BROKEN  the audit folder: ${error.message}`);
+      renderer.info(lines.join("\n"));
+      return;
+    }
+    if (results.length === 0) lines.push("  none yet");
     let broken = 0;
-    for (const file of files) {
-      const result = await verifyAuditFile(file);
-      const name = file.slice(runtime.audit.dir.length + 1);
-      if (result.ok) {
-        lines.push(`  ok      ${name} (${result.lines} lines)`);
+    let unchecked = 0;
+    for (const result of results) {
+      if ("missing" in result) {
+        broken++;
+        lines.push(`  MISSING ${result.file}: the checkpoint names it, but the file is gone`);
+      } else if ("brokenCheckpoint" in result) {
+        broken++;
+        lines.push(`  BROKEN  ${result.file}: its checkpoint: ${result.brokenCheckpoint}`);
+      } else if (result.verdict.ok) {
+        if (!result.checkpoint) unchecked++;
+        lines.push(
+          `  ok      ${result.file} (${result.verdict.lines} lines${result.checkpoint ? ", checkpoint" : ""})`
+        );
       } else {
         broken++;
-        lines.push(`  BROKEN  ${name}: line ${result.line}: ${result.why}`);
+        lines.push(`  BROKEN  ${result.file}: line ${result.verdict.line}: ${result.verdict.why}`);
       }
     }
-    if (broken > 0) lines.push(`${broken} file(s) were changed after Garuda wrote them.`);
-    lines.push("This check cannot see lines cut from the end of a file, or a removed file.");
+    if (broken > 0)
+      lines.push(`${broken} file(s) were changed or removed after Garuda wrote them.`);
+    if (unchecked > 0) {
+      lines.push(
+        `${unchecked} file(s) have no checkpoint: this check cannot see lines cut from their end, or a removed file. The team policy can turn on "audit": { "checkpoint": true }.`
+      );
+    }
+    lines.push(
+      "Someone with your rights can rewrite a file and its checkpoint together; this check cannot see that."
+    );
     renderer.info(lines.join("\n"));
     return;
   }
@@ -767,11 +815,12 @@ function usageSummary(runtime) {
   const session = runtime.session;
   if (session === void 0) return "No session yet.";
   const u = session.usage;
-  const cost = session.costUsd === void 0 ? "cost unknown" : `$${session.costUsd.toFixed(4)}`;
+  const cost = session.costUsd === void 0 ? "cost unknown" : isCostIncomplete(session) ? `\u2265 $${session.costUsd.toFixed(4)} (incomplete)` : `$${session.costUsd.toFixed(4)}`;
   return [
-    `Session ${session.id}: ${formatTokens(totalTokens(u))} tokens, ${cost}`,
+    `Session ${session.id}: ${formatTokens(totalTokens(u))}${budgetNote(session) !== void 0 ? " reported" : ""} tokens, ${cost}`,
     `  input ${formatTokens(u.inputTokens)}, cache read ${formatTokens(u.cacheReadTokens)}, cache write ${formatTokens(u.cacheWriteTokens)}, output ${formatTokens(u.outputTokens)}`,
     `  context ${formatTokens(session.contextTokens)} of ${formatTokens(runtime.limits.contextWindow)}`,
+    ...budgetNote(session) === void 0 ? [] : [`  ${budgetNote(session)}`],
     ...u.webSearches === void 0 ? [] : [
       `  Claude web searches: ${u.webSearches} ($${(u.webSearches * WEB_SEARCH_USD).toFixed(2)})`
     ]
@@ -1244,4 +1293,4 @@ export {
   statusOf,
   CommandArgs
 };
-//# sourceMappingURL=chunk-ENLDPN4S.js.map
+//# sourceMappingURL=chunk-Z66BWTMD.js.map