@akira-tl/forgerelay 1.2.5 → 1.3.1

package/schemas/v1/config.project.schema.json

@@ -5,6 +5,80 @@
     "$schema": {
       "description": "Editor-only JSON Schema URL. Ignored by ForgeRelay resolution.",
       "type": "string"
+    },
+    "systemInstructionsPath": {
+      "description": "Selected system-level Agent instruction file consumed by ForgeRelay.",
+      "type": "string",
+      "minLength": 1,
+      "default": "~/.agents/AGENTS.md",
+      "x-forgerelay-scopes": [
+        "runtime",
+        "project-local",
+        "project",
+        "user",
+        "built-in"
+      ],
+      "x-forgerelay-merge": "replace",
+      "x-forgerelay-reload": "hot",
+      "x-forgerelay-sensitivity": "public",
+      "x-forgerelay-interpolation": "none",
+      "x-forgerelay-execution-effect": "none",
+      "x-forgerelay-runtime-override": {
+        "env": "FORGERELAY_SYSTEM_INSTRUCTIONS_PATH"
+      }
+    },
+    "instructionNames": {
+      "description": "Project instruction basenames discovered hierarchically within a Workspace.",
+      "type": "array",
+      "items": {
+        "type": "string",
+        "minLength": 1
+      },
+      "default": [
+        "AGENTS.md"
+      ],
+      "x-forgerelay-scopes": [
+        "runtime",
+        "project-local",
+        "project",
+        "user",
+        "built-in"
+      ],
+      "x-forgerelay-merge": "replace",
+      "x-forgerelay-reload": "hot",
+      "x-forgerelay-sensitivity": "public",
+      "x-forgerelay-interpolation": "none",
+      "x-forgerelay-execution-effect": "none",
+      "x-forgerelay-runtime-override": {
+        "env": "FORGERELAY_INSTRUCTION_NAMES"
+      }
+    },
+    "skillPaths": {
+      "description": "Ordered Agent Skill source directories; explicit higher-precedence lists replace lower-precedence lists.",
+      "type": "array",
+      "items": {
+        "type": "string",
+        "minLength": 1
+      },
+      "default": [
+        "~/.agents/skills",
+        "./.agents/skills"
+      ],
+      "x-forgerelay-scopes": [
+        "runtime",
+        "project-local",
+        "project",
+        "user",
+        "built-in"
+      ],
+      "x-forgerelay-merge": "replace",
+      "x-forgerelay-reload": "hot",
+      "x-forgerelay-sensitivity": "public",
+      "x-forgerelay-interpolation": "none",
+      "x-forgerelay-execution-effect": "none",
+      "x-forgerelay-runtime-override": {
+        "env": "FORGERELAY_SKILL_PATHS"
+      }
     }
   },
   "additionalProperties": false,

package/schemas/v1/config.user.schema.json

@@ -370,11 +370,14 @@
       "x-forgerelay-computed-default": "~/.codex"
     },
     "systemInstructionsPath": {
-      "description": "Global Agent instruction file consumed by ForgeRelay.",
+      "description": "Selected system-level Agent instruction file consumed by ForgeRelay.",
       "type": "string",
       "minLength": 1,
+      "default": "~/.agents/AGENTS.md",
       "x-forgerelay-scopes": [
         "runtime",
+        "project-local",
+        "project",
         "user",
         "built-in"
       ],
@@ -385,8 +388,60 @@
       "x-forgerelay-execution-effect": "none",
       "x-forgerelay-runtime-override": {
         "env": "FORGERELAY_SYSTEM_INSTRUCTIONS_PATH"
+      }
+    },
+    "instructionNames": {
+      "description": "Project instruction basenames discovered hierarchically within a Workspace.",
+      "type": "array",
+      "items": {
+        "type": "string",
+        "minLength": 1
+      },
+      "default": [
+        "AGENTS.md"
+      ],
+      "x-forgerelay-scopes": [
+        "runtime",
+        "project-local",
+        "project",
+        "user",
+        "built-in"
+      ],
+      "x-forgerelay-merge": "replace",
+      "x-forgerelay-reload": "hot",
+      "x-forgerelay-sensitivity": "public",
+      "x-forgerelay-interpolation": "none",
+      "x-forgerelay-execution-effect": "none",
+      "x-forgerelay-runtime-override": {
+        "env": "FORGERELAY_INSTRUCTION_NAMES"
+      }
+    },
+    "skillPaths": {
+      "description": "Ordered Agent Skill source directories; explicit higher-precedence lists replace lower-precedence lists.",
+      "type": "array",
+      "items": {
+        "type": "string",
+        "minLength": 1
       },
-      "x-forgerelay-computed-default": "~/.agents/AGENTS.md"
+      "default": [
+        "~/.agents/skills",
+        "./.agents/skills"
+      ],
+      "x-forgerelay-scopes": [
+        "runtime",
+        "project-local",
+        "project",
+        "user",
+        "built-in"
+      ],
+      "x-forgerelay-merge": "replace",
+      "x-forgerelay-reload": "hot",
+      "x-forgerelay-sensitivity": "public",
+      "x-forgerelay-interpolation": "none",
+      "x-forgerelay-execution-effect": "none",
+      "x-forgerelay-runtime-override": {
+        "env": "FORGERELAY_SKILL_PATHS"
+      }
     },
     "commandShell": {
       "description": "Recorded command-shell preference for ForgeRelay command and Hook execution.",

package/scripts/ci/config-v2-product-acceptance.mjs

@@ -87,25 +87,30 @@ async function acceptFreshInit({ installedCli, root, home }) {
   });
 
   let output = "";
-  let rootsAnswered = false;
-  let modeAnswered = false;
+  const promptsToAccept = [
+    "Where are your projects located?",
+    "Which system instruction file should ForgeRelay load?",
+    "Which project instruction filenames should ForgeRelay discover?",
+    "Which Skill directories should ForgeRelay scan?",
+    "How should clients reach this ForgeRelay instance?",
+  ];
+  const answered = new Set();
   child.onData((data) => {
     output += data;
-    if (!rootsAnswered && output.includes("Where are your projects located?")) {
-      rootsAnswered = true;
-      child.write("\r");
-      return;
-    }
-    if (rootsAnswered && !modeAnswered && output.includes("How should clients reach this ForgeRelay instance?")) {
-      modeAnswered = true;
-      child.write("\r");
+    for (const prompt of promptsToAccept) {
+      if (!answered.has(prompt) && output.includes(prompt)) {
+        answered.add(prompt);
+        child.write("\r");
+        break;
+      }
     }
   });
 
   const exitCode = await waitForPtyExit(child, 20_000);
   assert.equal(exitCode, 0, scrubTerminal(output));
-  assert.equal(rootsAnswered, true, "packaged init did not ask for project roots");
-  assert.equal(modeAnswered, true, "packaged init did not ask for connection mode");
+  for (const prompt of promptsToAccept) {
+    assert.equal(answered.has(prompt), true, `packaged init did not ask: ${prompt}`);
+  }
   for (const unexpected of [
     "Which local port should ForgeRelay use?",
     "Which command shell should Agent commands and Hooks use?",

package/scripts/debug/runtime.mjs

@@ -40,7 +40,23 @@ export function interactiveDebugUrls(configDir) {
     : 7677;
   const displayHost = host.includes(":") && !host.startsWith("[") ? `[${host}]` : host;
   const baseUrl = `http://${displayHost}:${port}`;
-  return { baseUrl, mcpUrl: `${baseUrl}/mcp` };
+  const publicBaseUrl = Array.isArray(config.publicBaseUrl) ? config.publicBaseUrl[0] : config.publicBaseUrl;
+  const routeBasePath = publicBasePath(publicBaseUrl);
+  return {
+    baseUrl,
+    healthUrl: `${baseUrl}${routeBasePath}/healthz`,
+    mcpUrl: `${baseUrl}/mcp`,
+  };
+}
+
+function publicBasePath(value) {
+  if (typeof value !== "string" || !value.trim()) return "";
+  try {
+    const pathname = new URL(value).pathname.replace(/\/+$/, "");
+    return pathname === "/" ? "" : pathname;
+  } catch {
+    return "";
+  }
 }
 
 function interactiveDebugOwnerToken(configDir) {
@@ -66,7 +82,7 @@ export function createInteractiveDebugEnvironment({
 } = {}) {
   const configDir = interactiveDebugConfigDir({ env, home });
   const ownerToken = interactiveDebugOwnerToken(configDir);
-  const { baseUrl, mcpUrl } = interactiveDebugUrls(configDir);
+  const { baseUrl, healthUrl, mcpUrl } = interactiveDebugUrls(configDir);
   const productConfigDir = env.FORGERELAY_DEBUG_PRODUCT_CONFIG_DIR
     ? resolve(env.FORGERELAY_DEBUG_PRODUCT_CONFIG_DIR.startsWith("~/")
       ? join(home, env.FORGERELAY_DEBUG_PRODUCT_CONFIG_DIR.slice(2))
@@ -99,7 +115,7 @@ export function createInteractiveDebugEnvironment({
     debugEnv.FORGERELAY_SKILLS = productSkillsEnabled;
   }
 
-  return { ownerToken, configDir, baseUrl, mcpUrl, env: debugEnv };
+  return { ownerToken, configDir, baseUrl, healthUrl, mcpUrl, env: debugEnv };
 }
 
 export function createDebugEnvironment({

package/scripts/debug/runtime.test.mjs

@@ -52,9 +52,11 @@ test("interactive debug uses one dedicated persisted config under ~/.forgerelay/
   assert.equal(result.configDir, configDir);
   assert.equal(result.env.FORGERELAY_CONFIG_DIR, configDir);
   assert.equal(result.baseUrl, "http://127.0.0.1:7677");
+  assert.equal(result.healthUrl, "http://127.0.0.1:7677/forgerelay/debug/healthz");
   assert.equal(result.mcpUrl, "http://127.0.0.1:7677/mcp");
   assert.deepEqual(interactiveDebugUrls(configDir), {
     baseUrl: "http://127.0.0.1:7677",
+    healthUrl: "http://127.0.0.1:7677/forgerelay/debug/healthz",
     mcpUrl: "http://127.0.0.1:7677/mcp",
   });
   assert.equal(result.env.HOST, undefined);
@@ -100,6 +102,7 @@ test("interactive debug config directory may be explicitly relocated without fal
   assert.equal(result.ownerToken, "custom-debug-password-123456");
   assert.equal(result.env.FORGERELAY_CONFIG_DIR, customDir);
   assert.equal(result.baseUrl, "http://127.0.0.1:6768");
+  assert.equal(result.healthUrl, "http://127.0.0.1:6768/healthz");
   assert.equal(result.mcpUrl, "http://127.0.0.1:6768/mcp");
   assert.equal(result.env.FORGERELAY_SKILL_PATHS, join(productConfigDir, "skills"));
 });

package/scripts/debug/serve.mjs

@@ -1,11 +1,11 @@
 import { spawn } from "node:child_process";
 import { createInteractiveDebugEnvironment, repoRoot } from "./runtime.mjs";
 
-const { configDir, baseUrl, mcpUrl, env } = createInteractiveDebugEnvironment();
+const { configDir, healthUrl, mcpUrl, env } = createInteractiveDebugEnvironment();
 
 console.error("[forgerelay:debug] local debug server");
 console.error(`[forgerelay:debug] debug config: ${configDir}/config.json`);
-console.error(`[forgerelay:debug] health: ${baseUrl}/healthz`);
+console.error(`[forgerelay:debug] health: ${healthUrl}`);
 console.error(`[forgerelay:debug] MCP: ${mcpUrl}`);
 console.error(`[forgerelay:debug] Owner password loaded from ${configDir}/auth.json`);
 console.error("[forgerelay:debug] all runtime state is under .forgerelay-debug/");