@akira-tl/forgerelay 1.2.5 → 1.3.0

package/dist/workspaces/resources/resource-monitor.js

@@ -24,6 +24,7 @@ export class WorkspaceResourceMonitor {
             tracked: new Map(),
             subscriptions: new Map(),
             changes: [],
+            announcements: [],
             deliveredRevisionByScope: new Map(),
         };
         state.root = input.root;
@@ -88,6 +89,20 @@ export class WorkspaceResourceMonitor {
             this.recordChange(workspaceId, key, oldContent, newContent);
         }));
     }
+    announce(workspaceId, text, coveredComponents) {
+        const state = this.states.get(workspaceId);
+        if (!state)
+            return;
+        state.revision += 1;
+        state.announcements.push({
+            revision: state.revision,
+            text,
+            coveredComponents,
+        });
+        if (state.announcements.length > MAX_HISTORY) {
+            state.announcements.splice(0, state.announcements.length - MAX_HISTORY);
+        }
+    }
     markSkillActivated(workspaceId, skillPath) {
         const state = this.states.get(workspaceId);
         if (!state)
@@ -118,25 +133,31 @@ export class WorkspaceResourceMonitor {
             synchronizeSharedWatch(key);
         const deliveredRevision = state.deliveredRevisionByScope.get(conversationScopeId) ?? state.revision;
         const changes = state.changes.filter((change) => change.revision > deliveredRevision);
+        const announcements = state.announcements.filter((announcement) => announcement.revision > deliveredRevision);
         state.deliveredRevisionByScope.set(conversationScopeId, state.revision);
-        if (changes.length === 0)
+        if (changes.length === 0 && announcements.length === 0)
             return undefined;
-        const grouped = coalesceChanges(changes);
         const sections = [];
         const coveredComponents = new Set();
-        for (const change of grouped) {
+        for (const change of coalesceChanges(changes)) {
             const formatted = formatResourceChange(change);
             if (!formatted)
                 continue;
-            sections.push(formatted.text);
+            sections.push({ revision: change.revision, text: formatted.text });
             for (const component of formatted.coveredComponents)
                 coveredComponents.add(component);
         }
+        for (const announcement of announcements) {
+            sections.push({ revision: announcement.revision, text: announcement.text });
+            for (const component of announcement.coveredComponents)
+                coveredComponents.add(component);
+        }
+        sections.sort((left, right) => left.revision - right.revision);
         this.pruneDeliveredHistory(state);
         if (sections.length === 0)
             return undefined;
         const header = "Workspace context changed after this Workspace was opened. Apply only these deltas; unchanged instructions and Skill metadata remain active:";
-        const joined = [header, ...sections].join("\n\n");
+        const joined = [header, ...sections.map((section) => section.text)].join("\n\n");
         const text = joined.length <= MAX_DELIVERY_CHARACTERS
             ? joined
             : `${joined.slice(0, MAX_DELIVERY_CHARACTERS)}\n\n[Additional Workspace context deltas were truncated; reopen with context=\"auto\" to refresh metadata.]`;
@@ -199,11 +220,13 @@ export class WorkspaceResourceMonitor {
         }
     }
     pruneDeliveredHistory(state) {
-        if (state.changes.length === 0 || state.deliveredRevisionByScope.size === 0)
+        if ((state.changes.length === 0 && state.announcements.length === 0) || state.deliveredRevisionByScope.size === 0)
             return;
         const floor = Math.min(...state.deliveredRevisionByScope.values());
         while (state.changes[0] && state.changes[0].revision <= floor)
             state.changes.shift();
+        while (state.announcements[0] && state.announcements[0].revision <= floor)
+            state.announcements.shift();
     }
 }
 function subscribeSharedWatch(inputPath, subscriberId, subscriber) {

package/dist/workspaces/resources/skills.js

@@ -4,16 +4,21 @@ import { basename, dirname, extname, join, resolve, sep } from "node:path";
 import { parse as parseYaml } from "yaml";
 import { markAdvertisedFileSourceActivated, resolveAdvertisedFileReadPath, } from "../../mcp/filesystem/advertised-files.js";
 import { expandHomePath, isPathInsideRoot } from "../../mcp/filesystem/roots.js";
+export function redactSkillDiagnosticMessage(diagnostic) {
+    let message = diagnostic.message;
+    const hiddenPaths = [
+        diagnostic.path,
+        diagnostic.collision?.winnerPath,
+        diagnostic.collision?.loserPath,
+    ].filter((path) => Boolean(path));
+    for (const path of hiddenPaths)
+        message = message.split(path).join("<skill-path>");
+    return message;
+}
 const FRONTMATTER_DELIMITER = "---";
-export function effectiveSkillPaths(config, cwd) {
-    const defaultPathCandidates = [
-        resolve(cwd, ".agents", "skills"),
-        resolve(cwd, ".forgerelay", "skills"),
-        config.configSkillsDir,
-    ];
-    const defaultPaths = defaultPathCandidates.filter((path) => path !== undefined && existsSync(path));
+export function effectiveSkillPaths(config, cwd, skillPaths = config.skillPaths) {
     const seen = new Set();
-    return [...defaultPaths, ...config.skillPaths]
+    return skillPaths
         .map((path) => resolveSkillPath(path, cwd))
         .filter((path) => {
         if (seen.has(path))
@@ -25,13 +30,13 @@ export function effectiveSkillPaths(config, cwd) {
 function resolveSkillPath(path, cwd) {
     return resolve(cwd, expandHomePath(path));
 }
-export function loadWorkspaceSkills(config, cwd) {
+export function loadWorkspaceSkills(config, cwd, skillPaths = config.skillPaths) {
     if (!config.skillsEnabled)
         return { skills: [], diagnostics: [] };
     const skills = [];
     const diagnostics = [];
     const winners = new Map();
-    for (const sourcePath of effectiveSkillPaths(config, cwd)) {
+    for (const sourcePath of effectiveSkillPaths(config, cwd, skillPaths)) {
         const candidates = discoverSkills(sourcePath, diagnostics);
         for (const skill of candidates) {
             const existing = winners.get(skill.name);

package/dist/workspaces/sessions.js

@@ -295,7 +295,7 @@ export class WorkspaceSessionService {
     }
     async reusedWorkspaceContext(workspace) {
         workspace.project = await resolveProjectContext(this.config.configDir, workspace.root);
-        Object.assign(workspace, this.context.loadSkillsForWorkspace(workspace.root));
+        Object.assign(workspace, await this.context.loadContextSourcesForWorkspace(workspace.project, workspace.root));
         workspace.capabilityGuides = loadCapabilityGuides(this.config);
         workspace.agentProfiles = await loadSubagentProfiles(this.config, workspace.root);
         workspace.scannedInstructionDirs.clear();
@@ -538,11 +538,13 @@ export class WorkspaceSessionService {
             return existing;
         }
         const root = this.context.assertWorkspaceRootAllowed(session.root, session.mode, session.sourceRoot);
+        const contextSources = this.context.defaultContextSources(root);
         const restoredWorkspace = {
             id: session.id,
             root,
             mode: session.mode,
             sourceRoot: session.sourceRoot,
+            contextSources,
             worktree: session.mode === "worktree"
                 ? {
                     path: root,
@@ -555,7 +557,7 @@ export class WorkspaceSessionService {
                     managed: session.managed,
                 }
                 : undefined,
-            ...this.context.loadSkillsForWorkspace(root),
+            ...this.context.loadSkillsForWorkspace(root, contextSources.skillPaths),
             capabilityGuides: loadCapabilityGuides(this.config),
             agentProfiles: [],
             activatedSkillDirs: new Set(),

package/dist/workspaces/state/project-context.js

@@ -1,6 +1,6 @@
 import { randomBytes } from "node:crypto";
 import { execFile } from "node:child_process";
-import { lstat, mkdir, readFile, realpath, rename, rm, writeFile } from "node:fs/promises";
+import { mkdir, readFile, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
 import { isAbsolute, join, resolve } from "node:path";
 import { promisify } from "node:util";
 import { withFileLock } from "../../runtime/state/lock/file-lock.js";
@@ -193,20 +193,46 @@ function newProjectId() {
 async function hasGitMetadataAncestor(workspaceRoot) {
     let current = workspaceRoot;
     for (;;) {
-        try {
-            await lstat(join(current, ".git"));
+        if (await isGitMetadataMarker(join(current, ".git")))
             return true;
-        }
-        catch (error) {
-            if (!isErrno(error, "ENOENT"))
-                throw error;
-        }
         const parent = resolve(current, "..");
         if (parent === current)
             return false;
         current = parent;
     }
 }
+async function isGitMetadataMarker(path) {
+    let metadata;
+    try {
+        metadata = await stat(path);
+    }
+    catch (error) {
+        if (isErrno(error, "ENOENT"))
+            return false;
+        throw error;
+    }
+    if (metadata.isDirectory()) {
+        try {
+            return (await readFile(join(path, "HEAD"), "utf8")).trim().length > 0;
+        }
+        catch (error) {
+            if (isErrno(error, "ENOENT") || isErrno(error, "ENOTDIR"))
+                return false;
+            throw error;
+        }
+    }
+    if (metadata.isFile()) {
+        try {
+            return /^gitdir:\s*\S+/i.test((await readFile(path, "utf8")).trim());
+        }
+        catch (error) {
+            if (isErrno(error, "ENOENT") || isErrno(error, "ENOTDIR"))
+                return false;
+            throw error;
+        }
+    }
+    return false;
+}
 function isGitRepositoryMiss(error) {
     if (!isRecord(error))
         return false;

package/dist/workspaces.js

@@ -360,14 +360,16 @@ export class WorkspaceRegistry {
         });
     }
     async createWorkspaceContext(input) {
+        const project = await resolveProjectContext(this.config.configDir, input.root);
+        const contextResources = await this.context.loadContextSourcesForWorkspace(project, input.root);
         const workspace = {
             id: `ws_${randomBytes(5).toString("hex")}`,
             root: input.root,
             mode: input.mode,
             sourceRoot: input.sourceRoot,
-            project: await resolveProjectContext(this.config.configDir, input.root),
+            project,
+            ...contextResources,
             worktree: input.worktree,
-            ...this.context.loadSkillsForWorkspace(input.root),
             capabilityGuides: loadCapabilityGuides(this.config),
             agentProfiles: await loadSubagentProfiles(this.config, input.root),
             activatedSkillDirs: new Set(),
@@ -421,6 +423,7 @@ export class WorkspaceRegistry {
     discoverPathInstructions(workspace, inputPath) {
         return this.context.discoverPathInstructions(workspace, inputPath);
     }
+    refreshContextSources(workspaceId) { return this.context.refreshContextSourcesForWorkspace(this.getWorkspace(workspaceId)); }
     claimResourceUpdates(workspaceId, conversationScopeId) {
         return this.context.claimResourceUpdates(workspaceId, conversationScopeId);
     }

package/docs/chatgpt-coding-workflow.md

@@ -174,23 +174,20 @@ state and does not recreate the physical backing.
 
 ## Instructions
 
-When a workspace opens, ForgeRelay first loads exactly one global system-instructions
-file. The default is `~/.agents/AGENTS.md`; configure a different single path with
-`FORGERELAY_SYSTEM_INSTRUCTIONS_PATH`. Symbolic links are followed so this entry can
-point at a canonical source elsewhere on disk.
+Agent context sources are resolved through General Config v2 using
+`runtime > project-local > project > user > built-in` precedence and replace semantics.
+ForgeRelay loads exactly one selected system-instructions file; the built-in default is
+`~/.agents/AGENTS.md`, and `FORGERELAY_SYSTEM_INSTRUCTIONS_PATH` is the runtime replacement.
+A missing selected system file is reported as unavailable but does not block Workspace open.
 
-ForgeRelay then loads root-level project instruction files when they exist:
-
-```text
-AGENTS.md
-AGENTS.MD
-CLAUDE.md
-CLAUDE.MD
-```
+Project/path-scoped instruction discovery is controlled by `instructionNames`. The built-in
+list is exactly `["AGENTS.md"]`; `CLAUDE.md`, `GEMINI.md`, or other basenames are discovered
+only when explicitly configured. `FORGERELAY_INSTRUCTION_NAMES` provides a comma-separated
+runtime replacement list.
 
 To keep broad workspaces such as `~` fast, initial nested-instruction discovery is
 bounded to direct child directories instead of recursively walking the whole tree.
-Deeper `AGENTS.md` / `CLAUDE.md` files are discovered lazily along a path the first
+Deeper configured instruction filenames are discovered lazily along a path the first
 time the Agent accesses it, and already-scanned directories are cached for the life
 of that workspace handle. A `read` result carries any newly discovered local
 instructions before the requested file content. Side-effecting file tools and shell
@@ -241,16 +238,22 @@ force the Host to discard a cached tool schema.
 
 ## Agent Skills
 
-ForgeRelay discovers Skills in precedence order from:
+`skillPaths` is an ordered General Config v2 list with replace semantics. Its built-in
+effective value is:
 
-- project `.agents/skills`
-- project `.forgerelay/skills`
-- the active ForgeRelay config directory's `skills` folder (`~/.forgerelay/skills` by default)
-- paths explicitly added through `FORGERELAY_SKILL_PATHS`
+```text
+~/.agents/skills
+./.agents/skills
+```
 
-These paths are discovery sources, not one shared ownership domain. Project `.agents/skills` is the open Agent Skills ecosystem and may contain files or symlinks managed by other Agent tooling. ForgeRelay-owned project/system Skills stay under `.forgerelay/skills` and the active ForgeRelay config directory. ForgeRelay does not automatically scan global Agent runtime Skill directories such as `~/.agents/skills` or `FORGERELAY_AGENT_DIR/skills`.
+The first path is user-home scoped; `./...` paths resolve from the current Workspace root.
+Project, Project Local, User, or runtime config can replace the complete list with any
+Agent ecosystem directories. `FORGERELAY_SKILL_PATHS` is the comma-separated runtime
+replacement. ForgeRelay does not implicitly scan `.forgerelay/skills`, provider-private
+Skill directories, or `FORGERELAY_AGENT_DIR/skills`.
 
-Same-named collisions use the first source: project Agent Skills override project ForgeRelay Skills, which override system ForgeRelay Skills and explicit additional paths.
+Same-named collisions use source-list order: the first discovered Skill name wins and the
+losing source remains visible through diagnostics.
 
 When a task matches an advertised skill, read its `SKILL.md` before using other
 files in the skill directory.

package/docs/configuration.md

@@ -888,21 +888,43 @@ Payload 用于策略和自动化，不包含文件正文、native-file credentia
 
 Hook 命令与 ForgeRelay 使用同一个本地用户权限。项目 `.forgerelay/hooks/*.json` 是可执行项目约定；允许某个 root 后，应把该 root 中的项目 Hook 视为本地开发环境的一部分。详见 [Security Model](security.md)。
 
-## System instructions
-
-ForgeRelay loads exactly one global system-instructions file. The default is
-`~/.agents/AGENTS.md`. Set `FORGERELAY_SYSTEM_INSTRUCTIONS_PATH` or the
-`systemInstructionsPath` config key to point at a different single file.
-Arrays or empty values are not accepted. Symbolic links are followed, so the
-runtime entry may point at a canonical source elsewhere on disk.
-
-Project-root `AGENTS.md` / `CLAUDE.md` files remain project context and are
-loaded separately. Initial nested-instruction discovery checks only direct child
-directories; deeper instruction files are discovered lazily when a workspace path
-is first accessed. Reads surface newly discovered instructions inline, while
-side-effecting file/shell operations stop before execution and require a retry if
-that access discovers new local instructions. `FORGERELAY_AGENT_DIR` does not
-select a global instruction file; its `skills` child is an additional Agent Skills source.
+## Agent context sources
+
+ForgeRelay resolves Agent instruction and Skill sources through General Config v2.
+The three source fields use normal precedence (`runtime > project-local > project > user > built-in`),
+and each higher-precedence value **replaces** the lower-precedence/default value rather than appending to it.
+`config get`, `config sources`, and `config explain` expose the same effective values and provenance.
+
+`systemInstructionsPath` selects exactly one system-instructions file. Its built-in default is
+`~/.agents/AGENTS.md`; `FORGERELAY_SYSTEM_INSTRUCTIONS_PATH` is the runtime override. A missing
+selected file does not prevent Workspace open, but ForgeRelay reports that instruction source as
+unavailable. `~` resolves through the current user's home directory; Workspace-relative paths are
+resolved from the current Workspace root.
+
+`instructionNames` controls hierarchical project-instruction discovery. Its built-in effective value is
+only `["AGENTS.md"]`; files such as `CLAUDE.md` or `GEMINI.md` are discovered only when explicitly
+listed. `FORGERELAY_INSTRUCTION_NAMES` accepts a comma-separated runtime replacement list. Initial
+nested discovery checks direct child directories; deeper matching instruction files are discovered lazily
+when a Workspace path is first accessed. Reads surface newly discovered instructions inline, while
+side-effecting file/shell operations stop before execution and require a retry if that access discovers new
+local instructions.
+
+`skillPaths` is an ordered source list. Its built-in effective value is:
+
+```json
+["~/.agents/skills", "./.agents/skills"]
+```
+
+`FORGERELAY_SKILL_PATHS` accepts a comma-separated runtime **replacement** list. Project and Project
+Local config may select another complete list as well. Missing configured directories are skipped quietly;
+existing unreadable/invalid Skills and same-name collisions remain diagnosable. If the same Skill name
+appears in multiple configured sources, the first source in the effective list wins. ForgeRelay does not
+implicitly scan `~/.forgerelay/skills`, `<project>/.forgerelay/skills`, provider-private Skill directories, or
+`FORGERELAY_AGENT_DIR/skills`.
+
+`forgerelay init` exposes these three fields with direct input prompts. Pressing Enter accepts the displayed
+current/default value; accepting the built-in default does not serialize a redundant override into
+`config.json`.
 
 ## Skills and subagents
 
@@ -911,18 +933,9 @@ select a global instruction file; its `skills` child is an additional Agent Skil
 | `FORGERELAY_SKILLS` | Set to `0` to hide skills. Enabled by default. |
 | `FORGERELAY_SUBAGENTS` | Set to `1` to expose configured subagent profiles. |
 | `FORGERELAY_AGENT_DIR` | Defaults to `~/.codex`; used by supported Agent integrations, not as an automatic Skill source. |
-| `FORGERELAY_SKILL_PATHS` | Optional comma-separated additional skill directories. |
-
-Skills are discovered in precedence order from:
-
-- project `.agents/skills`
-- project `.forgerelay/skills`
-- the active ForgeRelay config directory's `skills` folder (`~/.forgerelay/skills` by default)
-- paths explicitly added through `FORGERELAY_SKILL_PATHS`
-
-Project `.agents/skills` belongs to the open Agent Skills ecosystem and may contain files or symlinks installed by other Agent tooling. ForgeRelay-owned project/system Skills stay under `.forgerelay/skills` and the active ForgeRelay config directory. Global Agent runtime directories such as `~/.agents/skills` and `FORGERELAY_AGENT_DIR/skills` are not scanned automatically.
-
-When the same Skill name appears in more than one source, the first source wins: project Agent Skills override project ForgeRelay Skills, which override system ForgeRelay Skills and explicit additional paths.
+| `FORGERELAY_SYSTEM_INSTRUCTIONS_PATH` | Runtime replacement for the selected system instruction file. |
+| `FORGERELAY_INSTRUCTION_NAMES` | Runtime comma-separated replacement list for project instruction basenames. |
+| `FORGERELAY_SKILL_PATHS` | Runtime comma-separated replacement list for Skill source directories. |
 
 When subagents are enabled, canonical v1.2 profiles are discovered from:
 

package/docs/gotchas.md

@@ -192,14 +192,16 @@ Skills are enabled by default. Check:
 FORGERELAY_SKILLS=1 forgerelay serve
 ```
 
-Standard automatic discovery paths include:
+The built-in `skillPaths` list is:
 
-- project `.agents/skills`
-- project `.forgerelay/skills`
-- active ForgeRelay config `skills` directory (`~/.forgerelay/skills` by default)
-- additional paths explicitly configured through `FORGERELAY_SKILL_PATHS`
+```text
+~/.agents/skills
+./.agents/skills
+```
+
+The first entry is user-home scoped; the second is relative to the current Workspace root. Any User, Project, Project Local, or runtime `skillPaths` value replaces that complete list. `FORGERELAY_SKILL_PATHS` is the comma-separated runtime replacement.
 
-ForgeRelay does **not** automatically scan global Agent runtime Skill directories such as `~/.agents/skills` or `FORGERELAY_AGENT_DIR/skills`. Project `.agents/skills` remains the open Agent Skills source, while ForgeRelay-owned project/system Skills live under `.forgerelay/skills` and the active ForgeRelay config `skills` directory.
+If Skills are still missing, inspect the effective source with `forgerelay config get`, `forgerelay config sources`, or `forgerelay config explain config.skillPaths`. ForgeRelay does **not** implicitly scan `~/.forgerelay/skills`, project `.forgerelay/skills`, provider-private Skill directories, or `FORGERELAY_AGENT_DIR/skills`.
 
 ## Subagent profiles do not appear
 

package/docs/roadmap.md

@@ -189,7 +189,7 @@ capability
 - completed background process 的 Agent 可消费状态最多保留 5 分钟；底层 ChildProcess/PTY handle 在退出时立即释放，completed notice 数量与 active process 数量都有硬上限，并缩小单 process 输出驻留预算；
 - 高输出 head/tail buffer 保留 Unicode code-point 语义，但不再通过 `Array.from(整段输出)` 构造巨型临时数组，降低 V8 heap 扩容与 GC 压力；
 - MCP transport registry 与 review checkpoint state 加入容量边界；正常 transport close/workspace close 仍立即释放，异常遗弃对象不能再无限累积；OAuth 过期 authorization code 也会主动淘汰；
-- `open_workspace` 的 instruction discovery 首轮只检查 root 与直接子目录，不再递归整棵 workspace。更深层 `AGENTS.md` / `CLAUDE.md` 在 Agent 首次访问对应路径时沿祖先目录惰性发现，并缓存已扫描目录；read 可直接携带新发现指令，write/edit/rename/delete/bash 等副作用调用则在执行前返回指令并要求重试；
+- `open_workspace` 的 instruction discovery 首轮只检查 root 与直接子目录，不再递归整棵 workspace。更深层只匹配 effective `instructionNames`（当前 built-in default 只有 `AGENTS.md`，其他 basename 需显式配置），在 Agent 首次访问对应路径时沿祖先目录惰性发现，并缓存已扫描目录；read 可直接携带新发现指令，write/edit/rename/delete/bash 等副作用调用则在执行前返回指令并要求重试；
 - Workspace SQLite 继续作为本地持久化真源，不引入 Redis/PostgreSQL/Docker。高频 session/conversation `lastUsedAt` touch 进入内存 write-behind cache，最多每 5 分钟事务批量 flush，normal shutdown 再显式 flush；create/close/status 等语义性状态仍同步持久化；
 - debug runtime telemetry 定期报告 RSS/heap、transport、process、workspace cache 与 review state 数量，为后续真实实例资源趋势提供可观测性。
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akira-tl/forgerelay",
-  "version": "1.2.5",
+  "version": "1.3.0",
   "description": "Local development control plane for MCP coding agents.",
   "type": "module",
   "homepage": "https://github.com/Akira-TL/forgerelay#readme",
@@ -68,7 +68,7 @@
     "release:push-ready": "node scripts/release/push-ready.mjs",
     "postinstall": "node scripts/fix-node-pty-permissions.mjs",
     "start": "node dist/cli.js serve",
-    "test": "node --test scripts/debug/runtime.test.mjs scripts/config/schema-text.test.mjs scripts/release-proof.test.mjs scripts/release/release-gate.test.mjs scripts/release/push-ready.test.mjs scripts/release/release-version.test.mjs && tsx src/mcp/oauth/router.test.ts && tsx src/workspaces/relay/auth/remote-auth-cli.test.ts && tsx src/workspaces/relay/auth/remote-ssh-auth-cli.test.ts && tsx src/workspaces/relay/tests/lifecycle.test.ts && tsx src/workspaces/relay/tests/routing.test.ts && tsx src/workspaces/relay/tests/ssh.test.ts && tsx src/workspaces/relay/tests/process.test.ts && tsx src/workspaces/relay/tests/recovery.test.ts && tsx src/workspaces/relay/tests/checkpoint.test.ts && tsx src/workspaces/relay/tests/composite.test.ts && tsx src/runtime/config/definition/schema.test.ts && tsx src/runtime/config/resolution/resolver.test.ts && tsx src/runtime/security/project-execution-trust.test.ts && tsx src/runtime/config/resolution/hooks.test.ts && tsx src/workspaces/state/project-context.test.ts && tsx src/runtime/config/config.test.ts && tsx src/runtime/config/external-mcp-registry.test.ts && tsx src/runtime/config/external-mcp-auth-store.test.ts && tsx src/mcp/operations/external-mcp/external-mcp-oauth.test.ts && tsx src/cli/mcp/status.test.ts && tsx src/cli/mcp/diagnostics.test.ts && tsx src/cli/mcp/external-mcp.test.ts && tsx src/runtime/shell/command-shell-runtime.test.ts && tsx src/runtime/instructions/shell-instructions.test.ts && tsx src/runtime/instructions/powershell-skill.test.ts && tsx src/cli/shell/setup.test.ts && tsx src/lsp/language-server-config.test.ts && tsx src/lsp/runtime/managed-language-servers.test.ts && tsx src/lsp/normalization/hover.test.ts && tsx src/lsp/references.server.test.ts && tsx src/lsp/operations/document-symbols.server.test.ts && tsx src/lsp/operations/workspace-symbols.server.test.ts && tsx src/lsp/operations/diagnostics-push.server.test.ts && tsx src/lsp/operations/diagnostics-pull.server.test.ts && tsx src/lsp/operations/request-hardening.server.test.ts && tsx src/lsp/operations/recovery.server.test.ts && tsx src/lsp/operations/lifecycle.server.test.ts && tsx src/lsp/operations/project-trust.server.test.ts && tsx src/lsp/runtime/semantic-requests.test.ts && tsx src/runtime/logging/logger.test.ts && tsx src/runtime/logging/proxy-trust.test.ts && tsx src/runtime/state/lock/file-lock.test.ts && tsx src/runtime/state/runtime-lease.test.ts && tsx src/mcp/panel/mcp-app-template.test.ts && tsx src/mcp/hooks/hooks.test.ts && tsx src/mcp/hooks/hooks-trust.test.ts && tsx src/mcp/operations/external-mcp/external-mcp-transform.test.ts && tsx src/mcp/hooks/external-mcp-transform-trust.test.ts && tsx src/mcp/operations/external-mcp/external-mcp-trust.test.ts && tsx src/mcp/server/core/capability-registry.test.ts && tsx src/mcp/server-instructions.test.ts && tsx src/mcp/request-context.test.ts && tsx src/mcp/request-meta.test.ts && tsx src/mcp/artifacts/incoming-artifacts.test.ts && tsx src/mcp/artifacts/artifact-download.test.ts && tsx src/ui/core/card-types.test.ts && tsx src/ui/activity/model.test.ts && tsx src/ui/activity/detail-card.test.ts && tsx src/ui/review/patch-display.test.ts && tsx src/ui/core/tool-display.test.ts && tsx src/mcp/filesystem/apply-patch.test.ts && tsx src/mcp/process/process-platform.test.ts && tsx src/mcp/process/process-sessions.test.ts && tsx src/mcp/server/transport/mcp-sessions.test.ts && tsx src/mcp/server/transport/server-shutdown.test.ts && tsx src/mcp/server/operations/mutation-diagnostics.test.ts && tsx src/mcp/server/operations/hooks.test.ts && tsx src/subagents/providers/adapters/codex.test.ts && tsx src/subagents/providers/adapters/pi.test.ts && tsx src/subagents/providers/registry.test.ts && tsx src/subagents/providers/availability.test.ts && tsx src/subagents/profiles.test.ts && tsx src/subagents/cli-target.test.ts && tsx src/subagents/sessions/store.test.ts && tsx src/subagents/sessions/manager.test.ts && tsx src/subagents/sessions/project-trust.test.ts && tsx src/subagents/sessions/mcp/capability.server.test.ts && tsx src/subagents/sessions/mcp/continuation.server.test.ts && tsx src/subagents/sessions/mcp/lifecycle.server.test.ts && tsx src/subagents/sessions/mcp/reconciliation.server.test.ts && tsx src/subagents/sessions/mcp/routing.server.test.ts && tsx src/mcp/filesystem/roots.test.ts && tsx src/mcp/filesystem/file-mutations.test.ts && tsx src/mcp/operations/edit-preflight.test.ts && tsx src/workspaces/resources/skills.test.ts && tsx src/runtime/state/db/migrations.test.ts && tsx src/workspaces/state/workspace-store.test.ts && tsx src/workspaces/tasks/workspace-tasks.test.ts && tsx src/workspaces/tasks/workspace-task-reminders.test.ts && tsx src/activity/history/audit-store.test.ts && tsx src/activity/history/bash-output-store.test.ts && tsx src/activity/runtime/lifecycle.test.ts && tsx src/activity/history/query-service.test.ts && tsx src/mcp/operations/core-operation-executor.test.ts && tsx src/mcp/operations/bulk-mutation.test.ts && tsx src/mcp/operations/batch/scheduler.test.ts && tsx src/mcp/operations/batch/executor-policy.test.ts && tsx src/workspaces.test.ts && tsx src/workspaces/conversation-checkout.test.ts && tsx src/workspaces/conversation-worktree.test.ts && tsx src/workspaces/git/worktree-recovery.test.ts && tsx src/mcp/server/workspace/workspace-inventory.test.ts && tsx src/mcp/server/workspace/workspace-recovery.test.ts && tsx src/mcp/server/workspace/workspace-checkpoint.test.ts && tsx src/workspaces/review/review-checkpoints.test.ts && tsx src/lsp/code-intelligence.server.test.ts && npm run build:app && tsx src/mcp/process/server.test.ts && tsx src/mcp/panel/server.test.ts && tsx src/mcp/server/server.test.ts && tsx src/mcp/oauth/oauth-store.test.ts && tsx src/cli/maintenance.test.ts && tsx src/cli/maintenance-prune.test.ts && tsx src/cli/cli.test.ts",
+    "test": "node --test scripts/debug/runtime.test.mjs scripts/config/schema-text.test.mjs scripts/release-proof.test.mjs scripts/release/release-gate.test.mjs scripts/release/push-ready.test.mjs scripts/release/release-version.test.mjs && tsx src/mcp/oauth/router.test.ts && tsx src/workspaces/relay/auth/remote-auth-cli.test.ts && tsx src/workspaces/relay/auth/remote-ssh-auth-cli.test.ts && tsx src/workspaces/relay/tests/lifecycle.test.ts && tsx src/workspaces/relay/tests/routing.test.ts && tsx src/workspaces/relay/tests/ssh.test.ts && tsx src/workspaces/relay/tests/process.test.ts && tsx src/workspaces/relay/tests/recovery.test.ts && tsx src/workspaces/relay/tests/checkpoint.test.ts && tsx src/workspaces/relay/tests/composite.test.ts && tsx src/runtime/config/definition/schema.test.ts && tsx src/runtime/config/resolution/resolver.test.ts && tsx src/runtime/security/project-execution-trust.test.ts && tsx src/runtime/config/resolution/hooks.test.ts && tsx src/workspaces/state/project-context.test.ts && tsx src/runtime/config/config.test.ts && tsx src/cli/config/general.test.ts && tsx src/cli/config/domains/domain-cli.test.ts && node --test --import tsx src/cli/config/domains/context-cli.test.ts && node --test --import tsx src/cli/config/inspect.test.ts src/cli/config/migrate.test.ts && tsx src/runtime/config/external-mcp-registry.test.ts && tsx src/runtime/config/external-mcp-auth-store.test.ts && tsx src/mcp/operations/external-mcp/external-mcp-oauth.test.ts && tsx src/cli/mcp/status.test.ts && tsx src/cli/mcp/diagnostics.test.ts && tsx src/cli/mcp/external-mcp.test.ts && tsx src/runtime/shell/command-shell-runtime.test.ts && tsx src/runtime/instructions/shell-instructions.test.ts && tsx src/runtime/instructions/powershell-skill.test.ts && tsx src/cli/shell/setup.test.ts && tsx src/lsp/language-server-config.test.ts && tsx src/lsp/runtime/managed-language-servers.test.ts && tsx src/lsp/normalization/hover.test.ts && tsx src/lsp/references.server.test.ts && tsx src/lsp/operations/document-symbols.server.test.ts && tsx src/lsp/operations/workspace-symbols.server.test.ts && tsx src/lsp/operations/diagnostics-push.server.test.ts && tsx src/lsp/operations/diagnostics-pull.server.test.ts && tsx src/lsp/operations/request-hardening.server.test.ts && tsx src/lsp/operations/recovery.server.test.ts && tsx src/lsp/operations/lifecycle.server.test.ts && tsx src/lsp/operations/project-trust.server.test.ts && tsx src/lsp/runtime/semantic-requests.test.ts && tsx src/runtime/logging/logger.test.ts && tsx src/runtime/logging/proxy-trust.test.ts && tsx src/runtime/state/lock/file-lock.test.ts && tsx src/runtime/state/runtime-lease.test.ts && tsx src/cli/system/status.test.ts && tsx src/mcp/panel/mcp-app-template.test.ts && tsx src/mcp/hooks/hooks.test.ts && tsx src/mcp/hooks/hooks-trust.test.ts && tsx src/mcp/operations/external-mcp/external-mcp-transform.test.ts && tsx src/mcp/hooks/external-mcp-transform-trust.test.ts && tsx src/mcp/operations/external-mcp/external-mcp-trust.test.ts && tsx src/mcp/server/core/capability-registry.test.ts && tsx src/mcp/server-instructions.test.ts && tsx src/mcp/request-context.test.ts && tsx src/mcp/request-meta.test.ts && tsx src/mcp/artifacts/incoming-artifacts.test.ts && tsx src/mcp/artifacts/artifact-download.test.ts && tsx src/ui/core/card-types.test.ts && tsx src/ui/activity/model.test.ts && tsx src/ui/activity/detail-card.test.ts && tsx src/ui/review/patch-display.test.ts && tsx src/ui/core/tool-display.test.ts && tsx src/mcp/filesystem/apply-patch.test.ts && tsx src/mcp/process/process-platform.test.ts && tsx src/mcp/process/process-sessions.test.ts && tsx src/mcp/server/transport/mcp-sessions.test.ts && tsx src/mcp/server/transport/server-shutdown.test.ts && tsx src/mcp/server/operations/mutation-diagnostics.test.ts && tsx src/mcp/server/operations/hooks.test.ts && tsx src/subagents/providers/adapters/codex.test.ts && tsx src/subagents/providers/adapters/pi.test.ts && tsx src/subagents/providers/registry.test.ts && tsx src/subagents/providers/availability.test.ts && tsx src/subagents/profiles.test.ts && tsx src/subagents/cli-target.test.ts && tsx src/subagents/sessions/store.test.ts && tsx src/subagents/sessions/manager.test.ts && tsx src/subagents/sessions/project-trust.test.ts && tsx src/subagents/sessions/mcp/capability.server.test.ts && tsx src/subagents/sessions/mcp/continuation.server.test.ts && tsx src/subagents/sessions/mcp/lifecycle.server.test.ts && tsx src/subagents/sessions/mcp/reconciliation.server.test.ts && tsx src/subagents/sessions/mcp/routing.server.test.ts && tsx src/mcp/filesystem/roots.test.ts && tsx src/mcp/filesystem/file-mutations.test.ts && tsx src/mcp/operations/edit-preflight.test.ts && tsx src/workspaces/resources/skills.test.ts && tsx src/runtime/state/db/migrations.test.ts && tsx src/workspaces/state/workspace-store.test.ts && tsx src/workspaces/tasks/workspace-tasks.test.ts && tsx src/workspaces/tasks/workspace-task-reminders.test.ts && tsx src/activity/history/audit-store.test.ts && tsx src/activity/history/bash-output-store.test.ts && tsx src/activity/runtime/lifecycle.test.ts && tsx src/activity/history/query-service.test.ts && tsx src/mcp/operations/core-operation-executor.test.ts && tsx src/mcp/operations/bulk-mutation.test.ts && tsx src/mcp/operations/batch/scheduler.test.ts && tsx src/mcp/operations/batch/executor-policy.test.ts && tsx src/workspaces.test.ts && tsx src/workspaces/conversation-checkout.test.ts && tsx src/workspaces/conversation-worktree.test.ts && tsx src/workspaces/git/worktree-recovery.test.ts && tsx src/mcp/server/workspace/workspace-inventory.test.ts && tsx src/mcp/server/workspace/workspace-recovery.test.ts && tsx src/mcp/server/workspace/workspace-checkpoint.test.ts && tsx src/workspaces/review/review-checkpoints.test.ts && tsx src/lsp/code-intelligence.server.test.ts && npm run build:app && tsx src/mcp/process/server.test.ts && tsx src/mcp/panel/server.test.ts && tsx src/mcp/server/server.test.ts && tsx src/mcp/oauth/oauth-store.test.ts && tsx src/cli/maintenance.test.ts && tsx src/cli/maintenance-prune.test.ts && tsx src/cli/cli.test.ts",
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "release:check": "node scripts/release-version.mjs check",
     "release:tag-check": "node scripts/release-version.mjs tag",

package/schemas/v1/config.project-local.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,