ubume 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ubume",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Terminal UI for Ubume — TypeScript + Bun + Ink",
   "type": "module",
   "bin": {
@@ -47,12 +47,12 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/golba98/ubume-cli.git"
+    "url": "git+https://github.com/golba98/Ubume.git"
   },
   "bugs": {
-    "url": "https://github.com/golba98/ubume-cli/issues"
+    "url": "https://github.com/golba98/Ubume/issues"
   },
-  "homepage": "https://github.com/golba98/ubume-cli#readme",
+  "homepage": "https://github.com/golba98/Ubume#readme",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },

package/src/config/buildInfo.ts

@@ -1,3 +1,3 @@
 // Generated by scripts/gen-build-info.mjs — do not edit manually.
-export const BUILD_COMMIT = "cf100a7e97313dce7d66fab2424dc3ff55695db7" as const;
-export const APP_VERSION = "0.1.0" as const;
+export const BUILD_COMMIT = "cd0bbd0c106c85ce0610674130853ca0404b8967" as const;
+export const APP_VERSION = "0.1.1" as const;

package/src/core/providerRuntime/localHarness/runtime.ts

@@ -12,7 +12,13 @@ import { resolveDefaultMaxOutputTokens } from "../localOutputBudget.js";
 import type { LocalHarnessSessionMetadata } from "../../workspace/conversationStore.js";
 import { resolveUbumeWorkspaceDataDir } from "../../workspace/appData.js";
 import { getShellWorkspaceGuardMessage, isPathInsideAllowedRoots } from "../../workspace/workspaceGuard.js";
-import { ensureSessionScratchDir, pruneStaleScratchDirs } from "../../workspace/scratchDir.js";
+import {
+  describeSessionScratchDir,
+  ensureSessionScratchDir,
+  mentionsScratchDir,
+  pruneStaleScratchDirs,
+  removeUnusedSessionScratchDir,
+} from "../../workspace/scratchDir.js";
 import { isDangerousShellCommand } from "../../agent/tools.js";
 import { traceLocalStream } from "../../debug/localStreamDebug.js";
 import {
@@ -229,7 +235,8 @@ function resolveDshBin(): string {
 function prepareSessionScratch(request: ProviderChatRequest, sessionId: string, resumed: boolean): string | null {
   if (resolveHarnessSandboxMode(request) === "read-only") return null;
   try {
-    const scratch = ensureSessionScratchDir(request.workspaceRoot, sessionId);
+    // Only name the folder here; the tool/policy bridge creates it once a tool targets it.
+    const scratch = describeSessionScratchDir(request.workspaceRoot, sessionId);
     if (!resumed) pruneStaleScratchDirs(request.workspaceRoot, { keep: sessionId });
     return `Scratch directory for this session: ${scratch.relativePath}/ (put every temporary test, debug, or probe file there, not in the project).`;
   } catch (error) {
@@ -817,6 +824,13 @@ export class LocalHarnessProcess implements LocalHarnessRunner {
           return { kind: "deny", reason: `Path is outside the active workspace: ${candidatePath}` };
         }
       }
+      if ([command, ...pathsFrom(args)].some(mentionsScratchDir)) {
+        try {
+          ensureSessionScratchDir(state.request.workspaceRoot, state.sessionId);
+        } catch (error) {
+          traceLocalStream("harness.scratch.unavailable", { sessionId: state.sessionId, error: error instanceof Error ? error.message : String(error) });
+        }
+      }
       const signature = `${tool}:${command || pathsFrom(args).join(",")}`;
       if (state.approvals.has(signature)) return { kind: "allow" };
       if (state.request.runtime.policy.approvalPolicy === "on-request") return { kind: "ask", reason: `Allow ${commandFrom(tool, args)}?` };
@@ -963,6 +977,7 @@ export class LocalHarnessProcess implements LocalHarnessRunner {
     state.settled = true;
     state.abortCleanup();
     this.active = null;
+    if (state.request?.workspaceRoot) removeUnusedSessionScratchDir(state.request.workspaceRoot, state.sessionId);
     const completedMessages = [
       ...(state.request.conversationHistory ?? []),
       { role: "user", content: state.request.prompt },
@@ -985,6 +1000,8 @@ export class LocalHarnessProcess implements LocalHarnessRunner {
     state.settled = true;
     state.abortCleanup();
     this.active = null;
+    // Best-effort cleanup must never keep a failed run from settling.
+    if (state.request?.workspaceRoot) removeUnusedSessionScratchDir(state.request.workspaceRoot, state.sessionId);
     state.handlers.onLocalHarnessSession?.(null, state.sessionId);
     const child = this.child;
     const transport = this.transport;

package/src/core/workspace/scratchDir.ts

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, readdirSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readdirSync, rmdirSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 
 /** Workspace-relative home for agent throwaway files (test harnesses, probe scripts, logs). */
@@ -7,6 +7,7 @@ export const LEGACY_SCRATCH_RELATIVE_DIR = ".codexa/scratch";
 
 const DEFAULT_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000;
 const SAFE_SESSION_ID = /^[A-Za-z0-9_-]+$/;
+const SCRATCH_GITIGNORE = ".gitignore";
 
 export interface SessionScratchDir {
   absolutePath: string;
@@ -21,21 +22,67 @@ export function resolveLegacyScratchRoot(workspaceRoot: string): string {
   return join(workspaceRoot, ".codexa", "scratch");
 }
 
+/** Name the session scratch folder without touching the filesystem. */
+export function describeSessionScratchDir(workspaceRoot: string, sessionId: string): SessionScratchDir {
+  if (!SAFE_SESSION_ID.test(sessionId)) throw new Error(`Unsafe scratch session id: ${sessionId}`);
+  return {
+    absolutePath: join(resolveScratchRoot(workspaceRoot), sessionId),
+    relativePath: `${SCRATCH_RELATIVE_DIR}/${sessionId}`,
+  };
+}
+
+/** True when a tool path or shell command targets the workspace scratch folder. */
+export function mentionsScratchDir(value: string): boolean {
+  return value.replace(/\\/g, "/").includes(SCRATCH_RELATIVE_DIR);
+}
+
 /**
  * Create `.ubume/scratch/<sessionId>` inside the workspace. The scratch root
  * carries its own `*` .gitignore so git ignores it without touching the
  * project's ignore rules. It lives in the workspace (not the OS temp dir)
- * because sandboxed shells only get a persistent writable workspace.
+ * because sandboxed shells only get a persistent writable workspace. Call it
+ * only once a tool actually targets the folder, so unused sessions leave no
+ * trace in the project.
  */
 export function ensureSessionScratchDir(workspaceRoot: string, sessionId: string): SessionScratchDir {
-  if (!SAFE_SESSION_ID.test(sessionId)) throw new Error(`Unsafe scratch session id: ${sessionId}`);
+  const scratch = describeSessionScratchDir(workspaceRoot, sessionId);
   const root = resolveScratchRoot(workspaceRoot);
   mkdirSync(root, { recursive: true });
-  const gitignore = join(root, ".gitignore");
+  const gitignore = join(root, SCRATCH_GITIGNORE);
   if (!existsSync(gitignore)) writeFileSync(gitignore, "*\n", "utf8");
-  const absolutePath = join(root, sessionId);
-  mkdirSync(absolutePath, { recursive: true });
-  return { absolutePath, relativePath: `${SCRATCH_RELATIVE_DIR}/${sessionId}` };
+  mkdirSync(scratch.absolutePath, { recursive: true });
+  return scratch;
+}
+
+function removeDirIfEmpty(dir: string, ignoredEntries: readonly string[] = []): boolean {
+  let entries: string[];
+  try {
+    entries = readdirSync(dir);
+  } catch {
+    return false;
+  }
+  if (entries.some((entry) => !ignoredEntries.includes(entry))) return false;
+  for (const entry of entries) rmSync(join(dir, entry), { force: true });
+  rmdirSync(dir);
+  return true;
+}
+
+/**
+ * Best-effort removal of an empty session scratch folder, then of the
+ * `.ubume/scratch` root (when only its .gitignore remains) and `.ubume`
+ * (when nothing else lives there), so a session that never used scratch
+ * leaves the project untouched.
+ */
+export function removeUnusedSessionScratchDir(workspaceRoot: string, sessionId: string): void {
+  try {
+    const scratch = describeSessionScratchDir(workspaceRoot, sessionId);
+    if (existsSync(scratch.absolutePath) && !removeDirIfEmpty(scratch.absolutePath)) return;
+    const root = resolveScratchRoot(workspaceRoot);
+    if (!removeDirIfEmpty(root, [SCRATCH_GITIGNORE])) return;
+    removeDirIfEmpty(join(workspaceRoot, ".ubume"));
+  } catch {
+    // A locked or vanished folder must not break the run that triggered cleanup.
+  }
 }
 
 /** Best-effort removal of session scratch folders older than `maxAgeMs`. */