@@ -231,13 +231,22 @@ OpenCode adapter 在来源发现、解析和审批前不 import module、不读
 来源语义：先选 `$XDG_CONFIG_HOME/opencode/AGENTS.md`（默认 `~/.config/opencode/AGENTS.md`），不存在时回退
 `~/.claude/CLAUDE.md`；再按 `config.json`、`opencode.json`、`opencode.jsonc` 顺序合并，后出现的 `instructions`
 数组覆盖前者。最终数组支持 workspace 相对、`~/`、绝对本地精确文件和有界 glob；HTTP/HTTPS 项直接拒绝，不下载、
-缓存或探测网络。Product Assembly 依次合成 OpenCode、Codex、Claude Code 用户来源，再追加项目来源，并按 canonical path
-保留首项。非递归 glob 只遍历模式所需层级；递归 glob 超出固定扫描预算时只跳过该项，保留此前已读取的用户来源。
+缓存或探测网络。Product Assembly 依次合成 OpenCode、OpenBitFun 原生或 Codex、Claude Code 用户来源，再追加项目来源，并按 canonical path
+保留首项。OpenBitFun 从既有 product home（默认 `~/.openbitfun`，遵循 `OPENBITFUN_HOME`）读取 `AGENTS.md`：非空时跳过
+整个 Codex 用户指令来源，缺失或仅含空白时回退 Codex 原有的 override/base 选择。原生文件读取失败时隔离该来源、记录诊断并禁止缓存，
+不静默替换成 Codex 指令；下次消息重试。来源目录复用同一选择逻辑，原生来源标记为 `openbitfun`。
+非递归 glob 只遍历模式所需层级；递归 glob 超出固定扫描预算时只跳过该项，保留此前已读取的用户来源。
 用户与项目来源最终进入模型前还共享既有 256 文件、2 MiB 渲染上限，避免两个独立来源预算叠加扩大固定提示词。
 
 Workspace Instructions owner 继续读取项目根 `opencode.json`、`opencode.jsonc`、`.opencode/opencode.json` 和
-`.opencode/opencode.jsonc` 中的 `instructions` 数组，只接受工作区内相对精确文件与 glob，确定性排序后追加到既有
-项目 `AGENTS`/Claude 来源之后。Remote 只执行这条端口可见的项目路径，不读取控制端的用户目录。文件变更不启动
+`.opencode/opencode.jsonc` 中的 `instructions` 数组，只接受工作区内相对精确文件与 glob，并确定性排序。
+项目来源按 `AGENTS > Claude > OpenCode` 选择唯一指令族：AGENTS 在 `AGENTS.override.md`、`AGENTS.md` 中选首个非空文件；
+Claude 在 `CLAUDE.md`、`.claude/CLAUDE.md` 中选首个非空文件，再追加 `CLAUDE.local.md` 与 `.claude/rules/**/*.md`。
+不存在或仅含空白的文件不阻断回退；Claude 仅有 local 或 path-scoped rule 时也算有效指令族。选中上层后不再读取下层族，
+包括下层无效配置的诊断；启动上下文、来源目录和条件规则延迟激活共用该选择，避免 `Read` 后重新混入已被 AGENTS 屏蔽的 Claude 规则。
+Product Assembly 同时关闭 OpenCode 用户读取器的自动项目配置发现，避免该兼容入口重新混入被屏蔽的项目 `instructions`；
+全局配置中用户显式指定的工作区相对路径仍按原语义解析。
+Remote 只执行这条端口可见的项目路径，不读取控制端的用户目录。文件变更不启动
 watcher；用户通过统一的 `/reload instructions`（或默认 `/reload`）失效当前 Session 的 `UserContext` 缓存，下一条
 消息重新读取。用户生态失败不会吞掉项目 instructions，但会阻止本次 user context 写入缓存，因而下一条消息自动重试。
 
 
@@ -72,6 +72,28 @@ const MODULES = [
 
 const TEST_ROOT = join('C:', 'repo');
 
+test('workspace instruction owner requires family priority and non-empty fallback regressions', async () => {
+  const rule = requiredContentRules.find(
+    rule => rule.path === 'src/crates/services/services-core/tests/declarative_workspace_instruction_contracts.rs',
+  );
+  assert.ok(rule);
+  const source = await readFile(new URL(`../${rule.path}`, import.meta.url), 'utf8');
+  const accepts = text => rule.patterns.every(({ regex }) => regex.test(text));
+  assert.ok(accepts(source));
+
+  for (const name of [
+    'workspace_instruction_families_select_agents_then_claude_then_opencode',
+    'workspace_instruction_override_skips_empty_files_and_suppresses_claude',
+    'opencode_project_instructions_support_local_files_and_globs_only',
+  ]) {
+    assert.ok(!accepts(source.replace(name, 'removed_regression')), `must require ${name}`);
+  }
+  assert.ok(!accepts(source.replace(
+    'workspace_instruction_families_select_agents_then_claude_then_opencode',
+    'workspace_instruction_files_reads_agents_then_claude_and_skips_empty_files',
+  )));
+});
+
 test('builtin agent catalog requires the GeneralPurpose fast model default', () => {
   const rule = requiredContentRules.find(
     rule => rule.path === 'src/crates/execution/agent-runtime/src/agents.rs'
 
@@ -272,9 +272,13 @@ export const requiredContentRules = [
       'services-core workspace instruction owner must keep local and declarative discovery behavior contracts',
     patterns: [
       {
-        regex: /\bworkspace_instruction_files_reads_agents_then_claude_and_skips_empty_files\b/,
+        regex: /\bworkspace_instruction_families_select_agents_then_claude_then_opencode\b/,
         message: 'missing workspace instruction owner behavior regression',
       },
+      {
+        regex: /\bworkspace_instruction_override_skips_empty_files_and_suppresses_claude\b/,
+        message: 'missing non-empty workspace instruction override regression',
+      },
       {
         regex: /\bopencode_project_instructions_support_local_files_and_globs_only\b/,
         message: 'missing declarative workspace instruction behavior regression',
 
@@ -21,6 +21,36 @@ LAN session in the account slot attempt to restore the official Relay from the
 shared identity; failed sign-in leaves the previous credential on disk. Signing
 out closes both connections.
 
+## Global agent instructions
+
+Put personal instructions for local OpenBitFun sessions in
+`~/.openbitfun/AGENTS.md` (`%USERPROFILE%\.openbitfun\AGENTS.md` on Windows).
+If `OPENBITFUN_HOME` is set, the file is read from that directory instead.
+A non-empty file replaces Codex's global instructions, including
+`AGENTS.override.md`. If the OpenBitFun file is missing, empty, or whitespace-only,
+OpenBitFun keeps loading Codex's global instructions as before. OpenCode,
+Claude Code, and project instruction files continue to load independently.
+
+After editing the file, run `/reload instructions` in the session. The next
+message rebuilds its instruction context. Remote SSH/Docker workspaces use
+their workspace instruction files and do not load the controller's global files.
+
+## Project agent instructions
+
+OpenBitFun selects one instruction family at the workspace root, in this order:
+
+1. AGENTS: the first non-empty file among `AGENTS.override.md` and `AGENTS.md`.
+2. Claude: the first non-empty file among `CLAUDE.md` and `.claude/CLAUDE.md`,
+   followed by `CLAUDE.local.md` and `.claude/rules/**/*.md`.
+3. OpenCode: local instruction files referenced by the project OpenCode configs.
+
+Missing, empty, and whitespace-only files do not block a fallback. Once a
+family supplies instructions, lower-priority families are skipped. A Claude
+family containing only local notes or path-scoped rules still counts as selected.
+Path-scoped rules load only after a matching file is read, and only when the
+Claude family is selected. Use `/reload instructions` after changing the files
+to rebuild startup context on the next message.
+
 ## Session storage directories
 
 The workspace and session action menus include **Open session storage directory**.
 
@@ -122,6 +122,10 @@ Product-source boundary:
 - This crate must not depend on Codex, Claude Code, or another ecosystem adapter.
   New ecosystems are sibling adapters registered by Product Assembly, not modes of
   this adapter.
+- `OpenCodeInstructionSourceOptions::include_project_config` lets Product Assembly
+  suppress automatic project config discovery after selecting another instruction
+  family. Keep user-configured relative paths resolved against the workspace;
+  this switch must not change `OPENCODE_DISABLE_PROJECT_CONFIG` path semantics.
 - Production crates must not depend on `openbitfun_opencode_adapter` internals.
   Unsupported capabilities must return diagnostics or typed unsupported states
   instead of failing at runtime on external plugin content.
@@ -136,6 +140,7 @@ native import; OpenBitFun source suppression and revision fencing still apply.
 
 ## Verification
 
+- `cargo test --locked -p openbitfun-opencode-adapter --lib instruction_source::tests::`
 - `cargo test -p openbitfun-opencode-adapter --test opencode_source_adapter`
 - `cargo test -p openbitfun-opencode-adapter --test opencode_mcp_adapter`
 - `cargo test -p openbitfun-opencode-adapter --test opencode_static_source_contracts opencode_command_adapter::`
 
@@ -21,6 +21,9 @@ pub struct OpenCodeInstructionSourceOptions {
     pub config: OpenCodeLocalConfigOptions,
     pub home_dir: Option<PathBuf>,
     pub workspace_root: Option<PathBuf>,
+    /// Controls project config discovery independently of relative user paths.
+    /// Product Assembly disables it when another project instruction family wins.
+    pub include_project_config: bool,
     pub display_root: String,
 }
 
@@ -42,6 +45,7 @@ impl OpenCodeInstructionSourceOptions {
             config: OpenCodeLocalConfigOptions::from_environment(),
             home_dir,
             workspace_root: None,
+            include_project_config: true,
             display_root,
         }
     }
@@ -77,7 +81,9 @@ pub fn load_opencode_user_instructions(
     }
 
     let mut configured_instructions = None;
-    for item in local_source_plan(&options.config, options.workspace_root.as_deref(), None) {
+    let mut discovery_config = options.config.clone();
+    discovery_config.project_config_enabled &= options.include_project_config;
+    for item in local_source_plan(&discovery_config, options.workspace_root.as_deref(), None) {
         let LocalSourcePlanItem::Config(document) = item else {
             continue;
         };
@@ -396,10 +402,44 @@ mod tests {
             },
             home_dir,
             workspace_root,
+            include_project_config: true,
             display_root: "$XDG_CONFIG_HOME/opencode".to_string(),
         }
     }
 
+    #[test]
+    fn suppressed_project_config_keeps_user_relative_instruction_resolution() {
+        let temp = tempfile::tempdir().expect("tempdir");
+        let config = temp.path().join("config");
+        let workspace = temp.path().join("workspace");
+        std::fs::create_dir_all(&config).unwrap();
+        std::fs::create_dir_all(workspace.join(".opencode")).unwrap();
+        std::fs::write(config.join("AGENTS.md"), "User OpenCode rules").unwrap();
+        std::fs::write(
+            config.join("opencode.json"),
+            r#"{"instructions":["guide.md"]}"#,
+        )
+        .unwrap();
+        std::fs::write(
+            workspace.join("guide.md"),
+            "User configured workspace guide",
+        )
+        .unwrap();
+        std::fs::write(workspace.join("opencode.json"), "invalid project config").unwrap();
+        std::fs::write(
+            workspace.join(".opencode/opencode.json"),
+            "invalid directory config",
+        )
+        .unwrap();
+        let mut options = source_options(config, None, Some(workspace));
+        options.include_project_config = false;
+
+        let files = load_opencode_user_instructions(&options).expect("user sources only");
+        assert_eq!(files.len(), 2);
+        assert_eq!(files[0].content, "User OpenCode rules");
+        assert_eq!(files[1].content, "User configured workspace guide");
+    }
+
     #[test]
     fn global_config_uses_native_override_order_and_rejects_urls() {
         let temp = tempfile::tempdir().expect("tempdir");
 
@@ -368,6 +368,13 @@ For configured OpenCode discovery and explicit skill loading, include their owne
 cargo test --locked -p openbitfun-core --no-default-features --features agent-runtime,git,external-sources --lib agentic::tools::implementations::skill
 ```
 
+For native/Codex user-instruction selection, source catalog consistency, and
+local versus remote instruction composition:
+
+```bash
+cargo test --locked -p openbitfun-core --no-default-features --features external-sources,git --lib instruction_
+```
+
 Detached Dispatch controller, target query compatibility, and managed-baseline checks:
 
 ```bash