Merge branch 'dev' into project

packages/opencode/src/session/system.ts

@@ -2,6 +2,8 @@ import { Ripgrep } from "../file/ripgrep"
 import { Global } from "../global"
 import { Filesystem } from "../util/filesystem"
 import { Config } from "../config/config"
+import { Project } from "../project/project"
+import { Instance } from "../project/instance"
 import path from "path"
 import os from "os"
 
@@ -12,15 +14,16 @@ import PROMPT_GEMINI from "./prompt/gemini.txt"
 import PROMPT_ANTHROPIC_SPOOF from "./prompt/anthropic_spoof.txt"
 import PROMPT_SUMMARIZE from "./prompt/summarize.txt"
 import PROMPT_TITLE from "./prompt/title.txt"
-import { Project } from "../project/project"
-import { Instance } from "../project/instance"
+import PROMPT_COPILOT_GPT_5 from "./prompt/copilot-gpt-5.txt"
 
 export namespace SystemPrompt {
   export function header(providerID: string) {
     if (providerID.includes("anthropic")) return [PROMPT_ANTHROPIC_SPOOF.trim()]
     return []
   }
+
   export function provider(modelID: string) {
+    if (modelID.includes("gpt-5")) return [PROMPT_COPILOT_GPT_5]
     if (modelID.includes("gpt-") || modelID.includes("o1") || modelID.includes("o3")) return [PROMPT_BEAST]
     if (modelID.includes("gemini-")) return [PROMPT_GEMINI]
     if (modelID.includes("claude")) return [PROMPT_ANTHROPIC]
@@ -52,27 +55,52 @@ export namespace SystemPrompt {
     ]
   }
 
-  const CUSTOM_FILES = [
+  const LOCAL_RULE_FILES = [
     "AGENTS.md",
     "CLAUDE.md",
     "CONTEXT.md", // deprecated
   ]
+  const GLOBAL_RULE_FILES = [
+    path.join(Global.Path.config, "AGENTS.md"),
+    path.join(os.homedir(), ".claude", "CLAUDE.md"),
+  ]
 
   export async function custom() {
     const config = await Config.get()
     const paths = new Set<string>()
 
-    for (const item of CUSTOM_FILES) {
-      const matches = await Filesystem.findUp(item, Instance.directory, Instance.worktree)
-      matches.forEach((path) => paths.add(path))
+    for (const localRuleFile of LOCAL_RULE_FILES) {
+      const matches = await Filesystem.findUp(localRuleFile, Instance.directory, Instance.worktree)
+      if (matches.length > 0) {
+        matches.forEach((path) => paths.add(path))
+        break
+      }
     }
 
-    paths.add(path.join(Global.Path.config, "AGENTS.md"))
-    paths.add(path.join(os.homedir(), ".claude", "CLAUDE.md"))
+    for (const globalRuleFile of GLOBAL_RULE_FILES) {
+      if (await Bun.file(globalRuleFile).exists()) {
+        paths.add(globalRuleFile)
+        break
+      }
+    }
 
     if (config.instructions) {
-      for (const instruction of config.instructions) {
-        const matches = await Filesystem.globUp(instruction, Instance.directory, Instance.worktree).catch(() => [])
+      for (let instruction of config.instructions) {
+        if (instruction.startsWith("~/")) {
+          instruction = path.join(os.homedir(), instruction.slice(2))
+        }
+        let matches: string[] = []
+        if (path.isAbsolute(instruction)) {
+          matches = await Array.fromAsync(
+            new Bun.Glob(path.basename(instruction)).scan({
+              cwd: path.dirname(instruction),
+              absolute: true,
+              onlyFiles: true,
+            }),
+          ).catch(() => [])
+        } else {
+          matches = await Filesystem.globUp(instruction, Instance.directory, Instance.worktree).catch(() => [])
+        }
         matches.forEach((path) => paths.add(path))
       }
     }