Merge remote-tracking branch 'origin/dev' into refactor/modular-code-enforcement

# Conflicts:
#	src/agents/utils.ts
#	src/config/schema.ts
#	src/features/background-agent/spawner/background-session-creator.ts
#	src/features/background-agent/spawner/parent-directory-resolver.ts
#	src/features/background-agent/spawner/tmux-callback-invoker.ts
#	src/features/tmux-subagent/manager.ts
#	src/hooks/interactive-bash-session/index.ts
#	src/hooks/task-continuation-enforcer.test.ts
#	src/index.ts
#	src/plugin-handlers/config-handler.test.ts
#	src/tools/background-task/tools.ts
#	src/tools/call-omo-agent/tools.ts
#	src/tools/delegate-task/executor.ts

src/tools/delegate-task/skill-resolver.ts

@@ -0,0 +1,21 @@
+import type { GitMasterConfig, BrowserAutomationProvider } from "../../config/schema"
+import { resolveMultipleSkillsAsync } from "../../features/opencode-skill-loader/skill-content"
+import { discoverSkills } from "../../features/opencode-skill-loader"
+
+export async function resolveSkillContent(
+  skills: string[],
+  options: { gitMasterConfig?: GitMasterConfig; browserProvider?: BrowserAutomationProvider, disabledSkills?: Set<string> }
+): Promise<{ content: string | undefined; error: string | null }> {
+  if (skills.length === 0) {
+    return { content: undefined, error: null }
+  }
+
+  const { resolved, notFound } = await resolveMultipleSkillsAsync(skills, options)
+  if (notFound.length > 0) {
+    const allSkills = await discoverSkills({ includeClaudeCodePaths: true })
+    const available = allSkills.map(s => s.name).join(", ")
+    return { content: undefined, error: `Skills not found: ${notFound.join(", ")}. Available: ${available}` }
+  }
+
+  return { content: Array.from(resolved.values()).join("\n\n"), error: null }
+}

src/tools/delegate-task/types.ts

@@ -34,6 +34,10 @@ export interface ToolContextWithMetadata {
    * but present at runtime via spread in fromPlugin()). Used for metadata store keying.
    */
   callID?: string
+  /** @deprecated OpenCode internal naming may vary across versions */
+  callId?: string
+  /** @deprecated OpenCode internal naming may vary across versions */
+  call_id?: string
 }
 
 export interface SyncSessionCreatedEvent {