la-machina-engine 0.4.0 → 0.5.0

package/README.md

@@ -495,7 +495,7 @@ engine.run({ runId, nodeId, task })
 
 ### Storage Adapter
 
-Two backends, same interface:
+Three backends, same interface and the same relative layout on all of them:
 
 | Adapter | Backend | Use |
 |---------|---------|-----|
@@ -503,6 +503,33 @@ Two backends, same interface:
 | `R2StorageAdapter` | Cloudflare R2 via S3 protocol | Node / anywhere with S3 creds |
 | `R2BindingStorageAdapter` | Cloudflare R2 native binding (`env.BUCKET`) | Cloudflare Workers (`provider: 'r2-binding'`) |
 
+**Path layout (identical across all three backends):**
+
+```
+{rootPath}/workspaces/{workspaceId}/.claude/   ← tenant root
+├── memory/              ← tenant-shared, survives across runs
+├── skills/              ← (if config.skills.autoload)
+└── projects/{runId}/nodes/{nodeId}/
+    ├── state.json, snapshot.json, 000000.jsonl, meta.json
+    └── subagents/{agentId}/…    ← recursive, same shape
+```
+
+`workspaces/` is a namespace guard (keeps engine data separate from
+anything else in a shared bucket/filesystem); `.claude/` marks
+engine-owned content. Both cost one directory level each.
+
+**The workspace IS the tenant boundary.** One `workspaceId` per
+tenant; nothing is shared across workspaces. The previous
+`global` storage scope was removed in v0.5.0 — see migration note
+below.
+
+> **Migration from pre-0.5.0**: if you had data at `{rootPath}/.claude/`
+> (the old global scope), move it under your workspace root:
+> `mv {rootPath}/.claude {rootPath}/workspaces/{workspaceId}/.claude`.
+> `config.memory.scope: 'global'` still parses but emits a
+> deprecation warning and is rewritten to `'workspace'`; it'll be
+> rejected outright in v1.0.0.
+
 ### Smart Memory
 
 Per-workspace learning across runs:

package/dist/index.cjs

@@ -943,7 +943,8 @@ var ModelProviderEnum = import_zod.z.enum([
 ]);
 var StorageProviderEnum = import_zod.z.enum(["local", "r2", "r2-binding"]);
 var MemoryModeEnum = import_zod.z.enum(["off", "read-only", "read-write"]);
-var MemoryScopeEnum = import_zod.z.enum(["workspace", "global"]);
+var MemoryScopeUserEnum = import_zod.z.enum(["workspace", "global"]);
+var MemoryScopeResolvedEnum = import_zod.z.enum(["workspace"]);
 var FlushPolicyEnum = import_zod.z.enum(["turn-end", "entry", "manual"]);
 var LogLevelEnum = import_zod.z.enum(["silent", "error", "warn", "info", "debug"]);
 var R2ConfigResolved = import_zod.z.object({
@@ -982,7 +983,7 @@ var StorageConfigResolved = import_zod.z.object({
 });
 var MemoryConfigResolved = import_zod.z.object({
   mode: MemoryModeEnum,
-  scope: MemoryScopeEnum
+  scope: MemoryScopeResolvedEnum
 }).strict();
 var ToolsConfigResolved = import_zod.z.object({
   enabled: import_zod.z.array(import_zod.z.string()),
@@ -1177,7 +1178,10 @@ var StorageConfigUser = import_zod.z.object({
   r2: R2ConfigUser.optional(),
   r2Binding: R2BucketBindingShape.optional()
 }).strict();
-var MemoryConfigUser = MemoryConfigResolved.partial();
+var MemoryConfigUser = import_zod.z.object({
+  mode: MemoryModeEnum.optional(),
+  scope: MemoryScopeUserEnum.optional()
+}).strict();
 var ToolsConfigUser = ToolsConfigResolved.partial();
 var AgentsConfigUser = AgentsConfigResolved.partial();
 var SkillsConfigUser = SkillsConfigResolved.partial();
@@ -1290,8 +1294,21 @@ function splitApiRuntime(user) {
   const clone = { ...user, api: schemaSafe };
   return { stripped: clone, runtime };
 }
+function coerceDeprecatedMemoryScope(user) {
+  const scope = user.memory?.scope;
+  if (scope !== "global") return user;
+  console.warn(
+    '[la-machina] config.memory.scope: "global" is deprecated and has been rewritten to "workspace". Cross-tenant memory sharing was removed in Plan 022 \u2014 the workspace is the tenant root. This field value will be rejected outright in a future major release.'
+  );
+  const memory = user.memory ?? {};
+  return {
+    ...user,
+    memory: { ...memory, scope: "workspace" }
+  };
+}
 function mergeConfig(user) {
-  const { stripped, runtime } = splitApiRuntime(user);
+  const withCoercedScope = coerceDeprecatedMemoryScope(user);
+  const { stripped, runtime } = splitApiRuntime(withCoercedScope);
   const validatedUser = UserConfigSchema.parse(stripped);
   const merged = deepMerge(DEFAULTS, validatedUser);
   const resolved = ResolvedConfigSchema.parse(merged);
@@ -7165,7 +7182,7 @@ ${entries.map((e) => `- ${e}`).join("\n")}
 // src/memory/memoryConfig.ts
 function createSmartMemory(options) {
   const { storage, config } = options;
-  const adapter = config.scope === "global" ? storage.global : storage.workspace;
+  const adapter = storage.workspace;
   const hippocampus = new Hippocampus(adapter, "smart-memory");
   const writesEnabled = config.mode === "read-write";
   const readsEnabled = config.mode !== "off";
@@ -7536,18 +7553,7 @@ ${lessons}`);
 }
 async function collectSkills(storage, skillsDir) {
   const workspace = await loadSkills(storage.workspace, skillsDir);
-  const global = await loadSkills(storage.global, skillsDir);
-  const seen = /* @__PURE__ */ new Set();
-  const out = [];
-  for (const s of workspace) {
-    seen.add(s.name);
-    out.push({ name: s.name, description: s.description });
-  }
-  for (const s of global) {
-    if (seen.has(s.name)) continue;
-    out.push({ name: s.name, description: s.description });
-  }
-  return out;
+  return workspace.map((s) => ({ name: s.name, description: s.description }));
 }
 
 // src/engine/jsonOutput.ts
@@ -7881,14 +7887,8 @@ var StorageSkillSource = class {
     this.baseDir = options.baseDir ?? "skills";
   }
   async list() {
-    const [workspace, global] = await Promise.all([
-      loadSkills(this.storage.workspace, this.baseDir),
-      loadSkills(this.storage.global, this.baseDir)
-    ]);
-    const byName = /* @__PURE__ */ new Map();
-    for (const s of global) byName.set(s.name, s);
-    for (const s of workspace) byName.set(s.name, s);
-    return Array.from(byName.values()).map((s) => ({
+    const loaded = await loadSkills(this.storage.workspace, this.baseDir);
+    return loaded.map((s) => ({
       name: s.name,
       description: s.description,
       hasPages: s.hasPages
@@ -7896,8 +7896,7 @@ var StorageSkillSource = class {
   }
   async getSkillFile(skill) {
     if (!SAFE_NAME4.test(skill)) return null;
-    const found = await this.findFile(skill, "SKILL.md");
-    return found;
+    return this.findFile(skill, "SKILL.md");
   }
   async getPage(skill, page) {
     if (!SAFE_NAME4.test(skill)) return null;
@@ -7906,9 +7905,7 @@ var StorageSkillSource = class {
   }
   async listPages(skill) {
     if (!SAFE_NAME4.test(skill)) return [];
-    const wsPages = await this.listPagesIn(this.storage.workspace, skill);
-    if (wsPages.length > 0) return wsPages;
-    return this.listPagesIn(this.storage.global, skill);
+    return this.listPagesIn(this.storage.workspace, skill);
   }
   async listPagesIn(adapter, skill) {
     const pagesDir = `${this.baseDir}/${skill}/pages`;
@@ -7921,9 +7918,7 @@ var StorageSkillSource = class {
   }
   async findFile(skill, relative) {
     const path = `${this.baseDir}/${skill}/${relative}`;
-    const fromWorkspace = await this.readIfExists(this.storage.workspace, path);
-    if (fromWorkspace !== null) return fromWorkspace;
-    return this.readIfExists(this.storage.global, path);
+    return this.readIfExists(this.storage.workspace, path);
   }
   async readIfExists(adapter, path) {
     try {
@@ -8506,7 +8501,6 @@ async function createEngineStorage(config) {
 }
 async function createLocalStorage(config) {
   const path = await import("path");
-  const globalRoot = path.join(config.rootPath, ENGINE_DATA_FOLDER);
   const workspaceRoot = path.join(
     config.rootPath,
     WORKSPACES_FOLDER,
@@ -8514,7 +8508,6 @@ async function createLocalStorage(config) {
     ENGINE_DATA_FOLDER
   );
   return {
-    global: new LocalStorageAdapter(globalRoot),
     workspace: new LocalStorageAdapter(workspaceRoot)
   };
 }
@@ -8523,10 +8516,8 @@ function createR2Storage(config) {
     throw new StorageError('storage.r2 is required when storage.provider === "r2"');
   }
   const rootPrefix = config.rootPath.replace(/^\/+|\/+$/g, "");
-  const globalPrefix = `${rootPrefix}/${ENGINE_DATA_FOLDER}`;
   const workspacePrefix = `${rootPrefix}/${WORKSPACES_FOLDER}/${config.workspaceId}/${ENGINE_DATA_FOLDER}`;
   return {
-    global: new R2StorageAdapter(config.r2, globalPrefix),
     workspace: new R2StorageAdapter(config.r2, workspacePrefix)
   };
 }
@@ -8535,10 +8526,8 @@ function createR2BindingStorage(config) {
     throw new StorageError('storage.r2Binding is required when storage.provider === "r2-binding"');
   }
   const rootPrefix = config.rootPath.replace(/^\/+|\/+$/g, "");
-  const globalPrefix = `${rootPrefix}/${ENGINE_DATA_FOLDER}`;
   const workspacePrefix = `${rootPrefix}/${WORKSPACES_FOLDER}/${config.workspaceId}/${ENGINE_DATA_FOLDER}`;
   return {
-    global: new R2BindingStorageAdapter(config.r2Binding, globalPrefix),
     workspace: new R2BindingStorageAdapter(config.r2Binding, workspacePrefix)
   };
 }