@stardeck-customer-apps/compose 0.3.0 → 0.4.0

package/SKILL.md

@@ -40,6 +40,8 @@ from `apps/web/stardeck.compose.json` instead:
 ```jsonc
 {
   "connectedStores": [
+    // `type` is optional and defaults to "database"; "storage" marks an
+    // object-storage store. The platform writes database rows only for now.
     { "storeId": "ds_123", "slug": "media", "bindingKey": null, "accessLevel": "write" }
   ],
   "installs": {

package/dist/cli.js

@@ -239,6 +239,14 @@ var datastoreRequirementSchema = import_zod.z.object({
   id: tableNameSchema,
   /** "app" = this project's app-local store; "org" = an org-level shared store. */
   scope: import_zod.z.enum(["app", "org"]).default("app"),
+  /**
+   * Which kind of connected store satisfies this requirement. A "database"
+   * requirement only ever binds to a database store and a "storage" one
+   * (file/object storage — uploads, images) only to a storage store; the
+   * rail never crosses the two. Defaults to "database", the only kind the
+   * rail resolved before this field existed.
+   */
+  type: import_zod.z.enum(["database", "storage"]).default("database"),
   /** true → install fails when no store resolves; false → binding omitted, module degrades. */
   required: import_zod.z.boolean().default(true),
   /** Checked against the connected store's accessLevel at install. */
@@ -2080,7 +2088,11 @@ var composeInputsSchema = import_zod7.z.strictObject({
       // A row with an empty binding key must not fail a deploy: the rail
       // treats falsy as "no binding key", so normalise rather than reject.
       bindingKey: import_zod7.z.string().nullish().transform((value) => value || null),
-      accessLevel: import_zod7.z.enum(["read", "write", "admin"])
+      accessLevel: import_zod7.z.enum(["read", "write", "admin"]),
+      // Defaulted so a file written before the platform emitted store types
+      // (database rows only) still parses. The platform starts writing
+      // storage rows, with `type` set, once forks run a compose that reads it.
+      type: import_zod7.z.enum(["database", "storage"]).default("database")
     })
   ).default([]),
   installs: import_zod7.z.record(
@@ -2091,6 +2103,17 @@ var composeInputsSchema = import_zod7.z.strictObject({
     })
   ).default({})
 });
+var STUB_IGNORE_PATH = "apps/web/src/app/.gitignore";
+var STUB_IGNORE_HEADER = "# Generated by stardeck-compose \u2014 Module-rail stubs are build outputs; do not edit or commit them.";
+function escapeStubIgnorePattern(pattern) {
+  const escaped = pattern.replace(/[\\[\]*?]/g, (char) => `\\${char}`);
+  return /^[#!]/.test(escaped) ? `\\${escaped}` : escaped;
+}
+function buildStubIgnore(artifactPaths) {
+  const prefix = "apps/web/src/app/";
+  const entries = artifactPaths.filter((artifact) => artifact.startsWith(prefix)).map((artifact) => escapeStubIgnorePattern(`/${artifact.slice(prefix.length)}`)).sort();
+  return [STUB_IGNORE_HEADER, ...entries].join("\n") + "\n";
+}
 
 // ../../packages/lib/src/shared/module-enablement.ts
 function isModuleEnabledByList(raw, name, kindOf) {
@@ -3585,7 +3608,9 @@ function dirnamePosix(filePath) {
 // ../../packages/lib/src/server/module-rail/compose-inputs.ts
 async function buildComposeInputs(input) {
   const { db, projectId, deps } = input;
-  const connectedStores = await deps.listDatabaseStoresForProject(db, projectId);
+  const connectedStores = (await deps.listConnectedStoresForProject(db, projectId)).filter(
+    (store) => store.type === "database"
+  );
   const installRows = await Promise.all(
     input.moduleNames.map(async (moduleName) => ({
       moduleName,
@@ -3600,7 +3625,11 @@ async function buildComposeInputs(input) {
       datastoreBindings: install.datastoreBindings ?? null
     };
   }
-  return composeInputsSchema.parse({ connectedStores, installs });
+  const parsed = composeInputsSchema.parse({ connectedStores, installs });
+  return {
+    ...parsed,
+    connectedStores: parsed.connectedStores.map(({ type: _type, ...store }) => store)
+  };
 }
 
 // ../../packages/lib/src/shared/data-store-manifest.ts
@@ -3626,7 +3655,7 @@ function compareStores(a, b) {
 function describeCandidates(stores) {
   if (stores.length === 0) return "none";
   return stores.map(
-    (store) => `${store.storeId} (slug=${store.slug}, bindingKey=${store.bindingKey ?? "none"}, access=${store.accessLevel})`
+    (store) => `${store.storeId} (type=${store.type}, slug=${store.slug}, bindingKey=${store.bindingKey ?? "none"}, access=${store.accessLevel})`
   ).join(", ");
 }
 function groupStoresById(stores) {
@@ -3657,14 +3686,15 @@ function accessLevelForBinding(group, binding) {
   );
 }
 function resolveModuleDataStoreBindings(input) {
-  const stores = [...input.connectedStores].sort(compareStores);
-  const storeGroups = groupStoresById(stores);
+  const allStores = [...input.connectedStores].sort(compareStores);
   const requirements = [...input.requirements].sort((a, b) => compareStrings(a.id, b.id));
   const overrides = input.explicitOverrides ?? {};
   const bindings = {};
   const errors = [];
-  const candidates = describeCandidates(stores);
   for (const requirement of requirements) {
+    const stores = allStores.filter((store) => store.type === requirement.type);
+    const storeGroups = groupStoresById(stores);
+    const candidates = describeCandidates(allStores);
     const logicalSlug = dataStoreSlug(requirement.id);
     let selected;
     if (Object.prototype.hasOwnProperty.call(overrides, requirement.id)) {
@@ -3677,7 +3707,7 @@ function resolveModuleDataStoreBindings(input) {
           moduleName: input.moduleName,
           logicalId: requirement.id,
           kind: "explicit-override",
-          message: matches.length === 0 ? `Module "${input.moduleName}" data store "${requirement.id}" override "${override}" did not match a connected database store; candidates: ${candidates}` : `Module "${input.moduleName}" data store "${requirement.id}" override "${override}" is ambiguous; matches: ${describeCandidates(matches.flatMap((group) => group.stores))}`
+          message: matches.length === 0 ? `Module "${input.moduleName}" data store "${requirement.id}" override "${override}" did not match a connected ${requirement.type} store; candidates: ${candidates}` : `Module "${input.moduleName}" data store "${requirement.id}" override "${override}" is ambiguous; matches: ${describeCandidates(matches.flatMap((group) => group.stores))}`
         });
         continue;
       }
@@ -3688,6 +3718,8 @@ function resolveModuleDataStoreBindings(input) {
       );
       if (conventionMatches.length === 1) {
         selected = conventionMatches[0];
+      } else if (conventionMatches.length === 0 && requirement.type === "storage") {
+        if (storeGroups.length === 1) selected = storeGroups[0];
       } else if (conventionMatches.length === 0 && requirement.scope === "app") {
         if (storeGroups.length === 1) {
           selected = storeGroups[0];
@@ -4046,7 +4078,7 @@ async function resolveCompositionDataStoreBindings(context, presentNames, manife
   if (modulesWithRequirements.length === 0) return bindingsByModule;
   const deps = context.deps;
   if (!deps) throw new Error("Module rail dependencies are required for data-store bindings");
-  const connectedStores = await deps.listDatabaseStoresForProject(context.db, context.projectId);
+  const connectedStores = await deps.listConnectedStoresForProject(context.db, context.projectId);
   const installs = await Promise.all(
     modulesWithRequirements.map(
       (moduleName) => deps.getModuleInstall(context.db, context.projectId, moduleName)
@@ -4336,6 +4368,21 @@ async function writeComposeInputs(target) {
   );
   return written;
 }
+async function readStubIgnore(context) {
+  const existing = await context.sandbox.fileExists(STUB_IGNORE_PATH) ? await context.sandbox.readFile(STUB_IGNORE_PATH) : null;
+  if (existing !== null && existing.split("\n", 1)[0] !== STUB_IGNORE_HEADER) {
+    throw new Error(
+      `[ModuleRail] refusing to overwrite ${STUB_IGNORE_PATH}: it is not compose-generated (line 1 is not the generated header)`
+    );
+  }
+  return existing;
+}
+async function writeStubIgnore(context, existing, artifactPaths) {
+  const content = buildStubIgnore(artifactPaths);
+  const written = existing === null || existing.trimEnd() !== content.trimEnd();
+  if (written) await writeSandboxFileAtomic(context, STUB_IGNORE_PATH, content);
+  return written;
+}
 async function applyCompositionArtifactMutations(context, plan, existingFiles) {
   const appliedWrites = [];
   const appliedDeletes = [];
@@ -5200,9 +5247,17 @@ async function reconcileCompositionArtifacts(context, options = {}) {
       deps
     });
   }
+  const maintainIgnore = !options.dryRun && !options.enabledModulesRaw;
+  const existingIgnore = maintainIgnore ? await readStubIgnore(context) : null;
   if (changed && !options.dryRun) {
     await applyCompositionArtifactMutations(context, planned.plan, existingFiles);
   }
+  if (maintainIgnore) {
+    const wroteIgnore = await writeStubIgnore(context, existingIgnore, planned.plan.desiredPaths);
+    console.log(
+      `[ModuleRail] runId=${context.runId} stub ignore list entries=${planned.plan.desiredPaths.length} written=${wroteIgnore}`
+    );
+  }
   return {
     registryPath: planned.plan.registryPath,
     writePaths: planned.plan.writes.map((w) => w.path),
@@ -5239,7 +5294,8 @@ function readComposeInputs(cwd) {
       storeId: store.storeId,
       slug: store.slug,
       bindingKey: store.bindingKey ?? null,
-      accessLevel: store.accessLevel
+      accessLevel: store.accessLevel,
+      type: store.type
     })),
     installs: parsed.data.installs
   };
@@ -5373,7 +5429,7 @@ async function compose(options) {
   const deps = {
     sandbox,
     getModuleInstall: async (_db, _projectId, moduleName) => inputs.installs[moduleName] ?? null,
-    listDatabaseStoresForProject: async () => inputs.connectedStores
+    listConnectedStoresForProject: async () => inputs.connectedStores
   };
   const context = {
     db: {},

package/dist/index.d.mts

@@ -1,11 +1,12 @@
 import { z } from 'zod';
 
-/** A data store connected to a project, as the composition rail consumes it. */
+/** A data store (database or storage) connected to a project, as the composition rail consumes it. */
 type ConnectedStore = {
     storeId: string;
     slug: string;
     bindingKey: string | null;
     accessLevel: "read" | "write" | "admin";
+    type: "database" | "storage";
 };
 
 /**
@@ -30,6 +31,10 @@ declare const composeInputsSchema: z.ZodObject<{
             write: "write";
             admin: "admin";
         }>;
+        type: z.ZodDefault<z.ZodEnum<{
+            database: "database";
+            storage: "storage";
+        }>>;
     }, z.core.$strict>>>;
     installs: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
         installedVersion: z.ZodString;

package/dist/index.d.ts

@@ -1,11 +1,12 @@
 import { z } from 'zod';
 
-/** A data store connected to a project, as the composition rail consumes it. */
+/** A data store (database or storage) connected to a project, as the composition rail consumes it. */
 type ConnectedStore = {
     storeId: string;
     slug: string;
     bindingKey: string | null;
     accessLevel: "read" | "write" | "admin";
+    type: "database" | "storage";
 };
 
 /**
@@ -30,6 +31,10 @@ declare const composeInputsSchema: z.ZodObject<{
             write: "write";
             admin: "admin";
         }>;
+        type: z.ZodDefault<z.ZodEnum<{
+            database: "database";
+            storage: "storage";
+        }>>;
     }, z.core.$strict>>>;
     installs: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
         installedVersion: z.ZodString;

package/dist/index.js

@@ -314,6 +314,14 @@ var datastoreRequirementSchema = import_zod.z.object({
   id: tableNameSchema,
   /** "app" = this project's app-local store; "org" = an org-level shared store. */
   scope: import_zod.z.enum(["app", "org"]).default("app"),
+  /**
+   * Which kind of connected store satisfies this requirement. A "database"
+   * requirement only ever binds to a database store and a "storage" one
+   * (file/object storage — uploads, images) only to a storage store; the
+   * rail never crosses the two. Defaults to "database", the only kind the
+   * rail resolved before this field existed.
+   */
+  type: import_zod.z.enum(["database", "storage"]).default("database"),
   /** true → install fails when no store resolves; false → binding omitted, module degrades. */
   required: import_zod.z.boolean().default(true),
   /** Checked against the connected store's accessLevel at install. */
@@ -2078,7 +2086,11 @@ var composeInputsSchema = import_zod7.z.strictObject({
       // A row with an empty binding key must not fail a deploy: the rail
       // treats falsy as "no binding key", so normalise rather than reject.
       bindingKey: import_zod7.z.string().nullish().transform((value) => value || null),
-      accessLevel: import_zod7.z.enum(["read", "write", "admin"])
+      accessLevel: import_zod7.z.enum(["read", "write", "admin"]),
+      // Defaulted so a file written before the platform emitted store types
+      // (database rows only) still parses. The platform starts writing
+      // storage rows, with `type` set, once forks run a compose that reads it.
+      type: import_zod7.z.enum(["database", "storage"]).default("database")
     })
   ).default([]),
   installs: import_zod7.z.record(
@@ -2089,6 +2101,17 @@ var composeInputsSchema = import_zod7.z.strictObject({
     })
   ).default({})
 });
+var STUB_IGNORE_PATH = "apps/web/src/app/.gitignore";
+var STUB_IGNORE_HEADER = "# Generated by stardeck-compose \u2014 Module-rail stubs are build outputs; do not edit or commit them.";
+function escapeStubIgnorePattern(pattern) {
+  const escaped = pattern.replace(/[\\[\]*?]/g, (char) => `\\${char}`);
+  return /^[#!]/.test(escaped) ? `\\${escaped}` : escaped;
+}
+function buildStubIgnore(artifactPaths) {
+  const prefix = "apps/web/src/app/";
+  const entries = artifactPaths.filter((artifact) => artifact.startsWith(prefix)).map((artifact) => escapeStubIgnorePattern(`/${artifact.slice(prefix.length)}`)).sort();
+  return [STUB_IGNORE_HEADER, ...entries].join("\n") + "\n";
+}
 
 // ../../packages/lib/src/shared/module-enablement.ts
 function isModuleEnabledByList(raw, name, kindOf) {
@@ -3594,7 +3617,9 @@ function dirnamePosix(filePath) {
 // ../../packages/lib/src/server/module-rail/compose-inputs.ts
 async function buildComposeInputs(input) {
   const { db, projectId, deps } = input;
-  const connectedStores = await deps.listDatabaseStoresForProject(db, projectId);
+  const connectedStores = (await deps.listConnectedStoresForProject(db, projectId)).filter(
+    (store) => store.type === "database"
+  );
   const installRows = await Promise.all(
     input.moduleNames.map(async (moduleName) => ({
       moduleName,
@@ -3609,7 +3634,11 @@ async function buildComposeInputs(input) {
       datastoreBindings: install.datastoreBindings ?? null
     };
   }
-  return composeInputsSchema.parse({ connectedStores, installs });
+  const parsed = composeInputsSchema.parse({ connectedStores, installs });
+  return {
+    ...parsed,
+    connectedStores: parsed.connectedStores.map(({ type: _type, ...store }) => store)
+  };
 }
 
 // ../../packages/lib/src/shared/data-store-manifest.ts
@@ -3635,7 +3664,7 @@ function compareStores(a, b) {
 function describeCandidates(stores) {
   if (stores.length === 0) return "none";
   return stores.map(
-    (store) => `${store.storeId} (slug=${store.slug}, bindingKey=${store.bindingKey ?? "none"}, access=${store.accessLevel})`
+    (store) => `${store.storeId} (type=${store.type}, slug=${store.slug}, bindingKey=${store.bindingKey ?? "none"}, access=${store.accessLevel})`
   ).join(", ");
 }
 function groupStoresById(stores) {
@@ -3666,14 +3695,15 @@ function accessLevelForBinding(group, binding) {
   );
 }
 function resolveModuleDataStoreBindings(input) {
-  const stores = [...input.connectedStores].sort(compareStores);
-  const storeGroups = groupStoresById(stores);
+  const allStores = [...input.connectedStores].sort(compareStores);
   const requirements = [...input.requirements].sort((a, b) => compareStrings(a.id, b.id));
   const overrides = input.explicitOverrides ?? {};
   const bindings = {};
   const errors = [];
-  const candidates = describeCandidates(stores);
   for (const requirement of requirements) {
+    const stores = allStores.filter((store) => store.type === requirement.type);
+    const storeGroups = groupStoresById(stores);
+    const candidates = describeCandidates(allStores);
     const logicalSlug = dataStoreSlug(requirement.id);
     let selected;
     if (Object.prototype.hasOwnProperty.call(overrides, requirement.id)) {
@@ -3686,7 +3716,7 @@ function resolveModuleDataStoreBindings(input) {
           moduleName: input.moduleName,
           logicalId: requirement.id,
           kind: "explicit-override",
-          message: matches.length === 0 ? `Module "${input.moduleName}" data store "${requirement.id}" override "${override}" did not match a connected database store; candidates: ${candidates}` : `Module "${input.moduleName}" data store "${requirement.id}" override "${override}" is ambiguous; matches: ${describeCandidates(matches.flatMap((group) => group.stores))}`
+          message: matches.length === 0 ? `Module "${input.moduleName}" data store "${requirement.id}" override "${override}" did not match a connected ${requirement.type} store; candidates: ${candidates}` : `Module "${input.moduleName}" data store "${requirement.id}" override "${override}" is ambiguous; matches: ${describeCandidates(matches.flatMap((group) => group.stores))}`
         });
         continue;
       }
@@ -3697,6 +3727,8 @@ function resolveModuleDataStoreBindings(input) {
       );
       if (conventionMatches.length === 1) {
         selected = conventionMatches[0];
+      } else if (conventionMatches.length === 0 && requirement.type === "storage") {
+        if (storeGroups.length === 1) selected = storeGroups[0];
       } else if (conventionMatches.length === 0 && requirement.scope === "app") {
         if (storeGroups.length === 1) {
           selected = storeGroups[0];
@@ -4055,7 +4087,7 @@ async function resolveCompositionDataStoreBindings(context, presentNames, manife
   if (modulesWithRequirements.length === 0) return bindingsByModule;
   const deps = context.deps;
   if (!deps) throw new Error("Module rail dependencies are required for data-store bindings");
-  const connectedStores = await deps.listDatabaseStoresForProject(context.db, context.projectId);
+  const connectedStores = await deps.listConnectedStoresForProject(context.db, context.projectId);
   const installs = await Promise.all(
     modulesWithRequirements.map(
       (moduleName) => deps.getModuleInstall(context.db, context.projectId, moduleName)
@@ -4345,6 +4377,21 @@ async function writeComposeInputs(target) {
   );
   return written;
 }
+async function readStubIgnore(context) {
+  const existing = await context.sandbox.fileExists(STUB_IGNORE_PATH) ? await context.sandbox.readFile(STUB_IGNORE_PATH) : null;
+  if (existing !== null && existing.split("\n", 1)[0] !== STUB_IGNORE_HEADER) {
+    throw new Error(
+      `[ModuleRail] refusing to overwrite ${STUB_IGNORE_PATH}: it is not compose-generated (line 1 is not the generated header)`
+    );
+  }
+  return existing;
+}
+async function writeStubIgnore(context, existing, artifactPaths) {
+  const content = buildStubIgnore(artifactPaths);
+  const written = existing === null || existing.trimEnd() !== content.trimEnd();
+  if (written) await writeSandboxFileAtomic(context, STUB_IGNORE_PATH, content);
+  return written;
+}
 async function applyCompositionArtifactMutations(context, plan, existingFiles) {
   const appliedWrites = [];
   const appliedDeletes = [];
@@ -5209,9 +5256,17 @@ async function reconcileCompositionArtifacts(context, options = {}) {
       deps
     });
   }
+  const maintainIgnore = !options.dryRun && !options.enabledModulesRaw;
+  const existingIgnore = maintainIgnore ? await readStubIgnore(context) : null;
   if (changed && !options.dryRun) {
     await applyCompositionArtifactMutations(context, planned.plan, existingFiles);
   }
+  if (maintainIgnore) {
+    const wroteIgnore = await writeStubIgnore(context, existingIgnore, planned.plan.desiredPaths);
+    console.log(
+      `[ModuleRail] runId=${context.runId} stub ignore list entries=${planned.plan.desiredPaths.length} written=${wroteIgnore}`
+    );
+  }
   return {
     registryPath: planned.plan.registryPath,
     writePaths: planned.plan.writes.map((w) => w.path),
@@ -5248,7 +5303,8 @@ function readComposeInputs(cwd) {
       storeId: store.storeId,
       slug: store.slug,
       bindingKey: store.bindingKey ?? null,
-      accessLevel: store.accessLevel
+      accessLevel: store.accessLevel,
+      type: store.type
     })),
     installs: parsed.data.installs
   };
@@ -5382,7 +5438,7 @@ async function compose(options) {
   const deps = {
     sandbox,
     getModuleInstall: async (_db, _projectId, moduleName) => inputs.installs[moduleName] ?? null,
-    listDatabaseStoresForProject: async () => inputs.connectedStores
+    listConnectedStoresForProject: async () => inputs.connectedStores
   };
   const context = {
     db: {},

package/dist/index.mjs

@@ -276,6 +276,14 @@ var datastoreRequirementSchema = z.object({
   id: tableNameSchema,
   /** "app" = this project's app-local store; "org" = an org-level shared store. */
   scope: z.enum(["app", "org"]).default("app"),
+  /**
+   * Which kind of connected store satisfies this requirement. A "database"
+   * requirement only ever binds to a database store and a "storage" one
+   * (file/object storage — uploads, images) only to a storage store; the
+   * rail never crosses the two. Defaults to "database", the only kind the
+   * rail resolved before this field existed.
+   */
+  type: z.enum(["database", "storage"]).default("database"),
   /** true → install fails when no store resolves; false → binding omitted, module degrades. */
   required: z.boolean().default(true),
   /** Checked against the connected store's accessLevel at install. */
@@ -2040,7 +2048,11 @@ var composeInputsSchema = z7.strictObject({
       // A row with an empty binding key must not fail a deploy: the rail
       // treats falsy as "no binding key", so normalise rather than reject.
       bindingKey: z7.string().nullish().transform((value) => value || null),
-      accessLevel: z7.enum(["read", "write", "admin"])
+      accessLevel: z7.enum(["read", "write", "admin"]),
+      // Defaulted so a file written before the platform emitted store types
+      // (database rows only) still parses. The platform starts writing
+      // storage rows, with `type` set, once forks run a compose that reads it.
+      type: z7.enum(["database", "storage"]).default("database")
     })
   ).default([]),
   installs: z7.record(
@@ -2051,6 +2063,17 @@ var composeInputsSchema = z7.strictObject({
     })
   ).default({})
 });
+var STUB_IGNORE_PATH = "apps/web/src/app/.gitignore";
+var STUB_IGNORE_HEADER = "# Generated by stardeck-compose \u2014 Module-rail stubs are build outputs; do not edit or commit them.";
+function escapeStubIgnorePattern(pattern) {
+  const escaped = pattern.replace(/[\\[\]*?]/g, (char) => `\\${char}`);
+  return /^[#!]/.test(escaped) ? `\\${escaped}` : escaped;
+}
+function buildStubIgnore(artifactPaths) {
+  const prefix = "apps/web/src/app/";
+  const entries = artifactPaths.filter((artifact) => artifact.startsWith(prefix)).map((artifact) => escapeStubIgnorePattern(`/${artifact.slice(prefix.length)}`)).sort();
+  return [STUB_IGNORE_HEADER, ...entries].join("\n") + "\n";
+}
 
 // ../../packages/lib/src/shared/module-enablement.ts
 function isModuleEnabledByList(raw, name, kindOf) {
@@ -3556,7 +3579,9 @@ function dirnamePosix(filePath) {
 // ../../packages/lib/src/server/module-rail/compose-inputs.ts
 async function buildComposeInputs(input) {
   const { db, projectId, deps } = input;
-  const connectedStores = await deps.listDatabaseStoresForProject(db, projectId);
+  const connectedStores = (await deps.listConnectedStoresForProject(db, projectId)).filter(
+    (store) => store.type === "database"
+  );
   const installRows = await Promise.all(
     input.moduleNames.map(async (moduleName) => ({
       moduleName,
@@ -3571,7 +3596,11 @@ async function buildComposeInputs(input) {
       datastoreBindings: install.datastoreBindings ?? null
     };
   }
-  return composeInputsSchema.parse({ connectedStores, installs });
+  const parsed = composeInputsSchema.parse({ connectedStores, installs });
+  return {
+    ...parsed,
+    connectedStores: parsed.connectedStores.map(({ type: _type, ...store }) => store)
+  };
 }
 
 // ../../packages/lib/src/shared/data-store-manifest.ts
@@ -3597,7 +3626,7 @@ function compareStores(a, b) {
 function describeCandidates(stores) {
   if (stores.length === 0) return "none";
   return stores.map(
-    (store) => `${store.storeId} (slug=${store.slug}, bindingKey=${store.bindingKey ?? "none"}, access=${store.accessLevel})`
+    (store) => `${store.storeId} (type=${store.type}, slug=${store.slug}, bindingKey=${store.bindingKey ?? "none"}, access=${store.accessLevel})`
   ).join(", ");
 }
 function groupStoresById(stores) {
@@ -3628,14 +3657,15 @@ function accessLevelForBinding(group, binding) {
   );
 }
 function resolveModuleDataStoreBindings(input) {
-  const stores = [...input.connectedStores].sort(compareStores);
-  const storeGroups = groupStoresById(stores);
+  const allStores = [...input.connectedStores].sort(compareStores);
   const requirements = [...input.requirements].sort((a, b) => compareStrings(a.id, b.id));
   const overrides = input.explicitOverrides ?? {};
   const bindings = {};
   const errors = [];
-  const candidates = describeCandidates(stores);
   for (const requirement of requirements) {
+    const stores = allStores.filter((store) => store.type === requirement.type);
+    const storeGroups = groupStoresById(stores);
+    const candidates = describeCandidates(allStores);
     const logicalSlug = dataStoreSlug(requirement.id);
     let selected;
     if (Object.prototype.hasOwnProperty.call(overrides, requirement.id)) {
@@ -3648,7 +3678,7 @@ function resolveModuleDataStoreBindings(input) {
           moduleName: input.moduleName,
           logicalId: requirement.id,
           kind: "explicit-override",
-          message: matches.length === 0 ? `Module "${input.moduleName}" data store "${requirement.id}" override "${override}" did not match a connected database store; candidates: ${candidates}` : `Module "${input.moduleName}" data store "${requirement.id}" override "${override}" is ambiguous; matches: ${describeCandidates(matches.flatMap((group) => group.stores))}`
+          message: matches.length === 0 ? `Module "${input.moduleName}" data store "${requirement.id}" override "${override}" did not match a connected ${requirement.type} store; candidates: ${candidates}` : `Module "${input.moduleName}" data store "${requirement.id}" override "${override}" is ambiguous; matches: ${describeCandidates(matches.flatMap((group) => group.stores))}`
         });
         continue;
       }
@@ -3659,6 +3689,8 @@ function resolveModuleDataStoreBindings(input) {
       );
       if (conventionMatches.length === 1) {
         selected = conventionMatches[0];
+      } else if (conventionMatches.length === 0 && requirement.type === "storage") {
+        if (storeGroups.length === 1) selected = storeGroups[0];
       } else if (conventionMatches.length === 0 && requirement.scope === "app") {
         if (storeGroups.length === 1) {
           selected = storeGroups[0];
@@ -4017,7 +4049,7 @@ async function resolveCompositionDataStoreBindings(context, presentNames, manife
   if (modulesWithRequirements.length === 0) return bindingsByModule;
   const deps = context.deps;
   if (!deps) throw new Error("Module rail dependencies are required for data-store bindings");
-  const connectedStores = await deps.listDatabaseStoresForProject(context.db, context.projectId);
+  const connectedStores = await deps.listConnectedStoresForProject(context.db, context.projectId);
   const installs = await Promise.all(
     modulesWithRequirements.map(
       (moduleName) => deps.getModuleInstall(context.db, context.projectId, moduleName)
@@ -4307,6 +4339,21 @@ async function writeComposeInputs(target) {
   );
   return written;
 }
+async function readStubIgnore(context) {
+  const existing = await context.sandbox.fileExists(STUB_IGNORE_PATH) ? await context.sandbox.readFile(STUB_IGNORE_PATH) : null;
+  if (existing !== null && existing.split("\n", 1)[0] !== STUB_IGNORE_HEADER) {
+    throw new Error(
+      `[ModuleRail] refusing to overwrite ${STUB_IGNORE_PATH}: it is not compose-generated (line 1 is not the generated header)`
+    );
+  }
+  return existing;
+}
+async function writeStubIgnore(context, existing, artifactPaths) {
+  const content = buildStubIgnore(artifactPaths);
+  const written = existing === null || existing.trimEnd() !== content.trimEnd();
+  if (written) await writeSandboxFileAtomic(context, STUB_IGNORE_PATH, content);
+  return written;
+}
 async function applyCompositionArtifactMutations(context, plan, existingFiles) {
   const appliedWrites = [];
   const appliedDeletes = [];
@@ -5171,9 +5218,17 @@ async function reconcileCompositionArtifacts(context, options = {}) {
       deps
     });
   }
+  const maintainIgnore = !options.dryRun && !options.enabledModulesRaw;
+  const existingIgnore = maintainIgnore ? await readStubIgnore(context) : null;
   if (changed && !options.dryRun) {
     await applyCompositionArtifactMutations(context, planned.plan, existingFiles);
   }
+  if (maintainIgnore) {
+    const wroteIgnore = await writeStubIgnore(context, existingIgnore, planned.plan.desiredPaths);
+    console.log(
+      `[ModuleRail] runId=${context.runId} stub ignore list entries=${planned.plan.desiredPaths.length} written=${wroteIgnore}`
+    );
+  }
   return {
     registryPath: planned.plan.registryPath,
     writePaths: planned.plan.writes.map((w) => w.path),
@@ -5210,7 +5265,8 @@ function readComposeInputs(cwd) {
       storeId: store.storeId,
       slug: store.slug,
       bindingKey: store.bindingKey ?? null,
-      accessLevel: store.accessLevel
+      accessLevel: store.accessLevel,
+      type: store.type
     })),
     installs: parsed.data.installs
   };
@@ -5344,7 +5400,7 @@ async function compose(options) {
   const deps = {
     sandbox,
     getModuleInstall: async (_db, _projectId, moduleName) => inputs.installs[moduleName] ?? null,
-    listDatabaseStoresForProject: async () => inputs.connectedStores
+    listConnectedStoresForProject: async () => inputs.connectedStores
   };
   const context = {
     db: {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stardeck-customer-apps/compose",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Regenerates a Stardeck app's Module-rail artifacts — the five src/*.gen.ts registries and every route/endpoint stub — from src/modules/*/module.json",
   "main": "dist/index.js",
   "module": "dist/index.mjs",