nubos-pilot 1.3.4 → 1.3.5

package/lib/template.cjs

@@ -3,15 +3,14 @@ const path = require('node:path');
 const { projectStateDir, NubosPilotError } = require('./core.cjs');
 
 const PLACEHOLDER_RE = /\{\{\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*\}\}/g;
+const PACKAGE_TEMPLATES_DIR = path.resolve(__dirname, '..', 'templates');
 
 function templatesDir(cwd) {
   return path.join(projectStateDir(cwd), 'templates');
 }
 
-function loadTemplate(name, vars, cwd = process.cwd()) {
-  const dir = templatesDir(cwd);
+function resolveInDir(dir, name) {
   const filePath = path.resolve(dir, name + '.md');
-
   const dirWithSep = dir.endsWith(path.sep) ? dir : dir + path.sep;
   if (!filePath.startsWith(dirWithSep)) {
     throw new NubosPilotError(
@@ -20,21 +19,27 @@ function loadTemplate(name, vars, cwd = process.cwd()) {
       { template: name, path: filePath },
     );
   }
+  return filePath;
+}
 
-  let raw;
-  try {
-    raw = fs.readFileSync(filePath, 'utf-8');
-  } catch (err) {
-    if (err && err.code === 'ENOENT') {
-      throw new NubosPilotError(
-        'template-not-found',
-        `Template "${name}" not found at ${filePath}`,
-        { template: name, path: filePath },
-      );
-    }
-    throw err;
+function loadTemplate(name, vars, cwd = process.cwd()) {
+  const localPath = resolveInDir(templatesDir(cwd), name);
+  const packagePath = resolveInDir(PACKAGE_TEMPLATES_DIR, name);
+
+  let filePath = null;
+  if (fs.existsSync(localPath)) filePath = localPath;
+  else if (fs.existsSync(packagePath)) filePath = packagePath;
+
+  if (filePath === null) {
+    throw new NubosPilotError(
+      'template-not-found',
+      `Template "${name}" not found in project overlay (${localPath}) or package templates (${packagePath})`,
+      { template: name, path: localPath, packagePath },
+    );
   }
 
+  const raw = fs.readFileSync(filePath, 'utf-8');
+
   return raw.replace(PLACEHOLDER_RE, (_match, key) => {
     if (!(key in vars)) {
       throw new NubosPilotError(

package/lib/template.test.cjs

@@ -144,6 +144,41 @@ test('TPL-12: listTemplates on sandbox without templates dir returns []', () =>
   assert.deepEqual(list, []);
 });
 
+test('TPL-14: name absent in project overlay falls back to package template', () => {
+  const cwd = makeSandbox({});
+  const anyVars = new Proxy({}, { has: () => true, get: () => 'X' });
+  let out = null;
+  let thrown = null;
+  try {
+    out = tpl.loadTemplate('milestone/CONTEXT', anyVars, cwd);
+  } catch (err) {
+    thrown = err;
+  }
+  assert.equal(thrown, null, 'package fallback should resolve, not throw');
+  assert.equal(typeof out, 'string');
+  assert.ok(out.length > 0, 'package template rendered to non-empty output');
+});
+
+test('TPL-15: project overlay wins over package template of the same name', () => {
+  const cwd = makeSandbox({ RULES: 'LOCAL-OVERLAY {{x}}' });
+  const out = tpl.loadTemplate('RULES', { x: '1' }, cwd);
+  assert.equal(out, 'LOCAL-OVERLAY 1');
+});
+
+test('TPL-16: name absent in BOTH overlay and package → template-not-found with both paths', () => {
+  const cwd = makeSandbox({});
+  let thrown = null;
+  try {
+    tpl.loadTemplate('definitely-missing-xyz', {}, cwd);
+  } catch (err) {
+    thrown = err;
+  }
+  assert.ok(thrown, 'expected throw');
+  assert.equal(thrown.code, 'template-not-found');
+  assert.ok(thrown.details.path.endsWith(path.join('templates', 'definitely-missing-xyz.md')));
+  assert.ok(thrown.details.packagePath.endsWith(path.join('templates', 'definitely-missing-xyz.md')));
+});
+
 test('TPL-13: cwd with no .nubos-pilot ancestor → projectStateDir throws not-in-project', () => {
   const root = fs.mkdtempSync(path.join(os.tmpdir(), 'nubos-pilot-tpl-noroot-'));
   _sandboxes.push(root);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nubos-pilot",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "Self-hosted AI pilot for any codebase. Researcher and critic agents plan, execute and verify each change.",
   "homepage": "https://pilot.nubos.cloud",
   "repository": {